From 7eff31cfdd7e766e5568097a8c6290f2b31d7190 Mon Sep 17 00:00:00 2001
From: Bernd Blessmann <bibi@online.de>
Date: Sat, 6 Mar 2010 01:35:34 +0100
Subject: [PATCH] locale/en/locales.pl ausgef<FC>hrt.

---
 locale/en/SKR04-3804-addition                 | 16 ++++
 locale/en/acctranscorrections                 |  1 +
 .../add_more_constraints_fibu_projekt_xplace  | 13 +++
 locale/en/admin                               |  1 +
 locale/en/all                                 | 26 +++++-
 locale/en/am                                  |  2 +
 locale/en/amcvar                              |  1 +
 locale/en/amtemplates                         |  1 +
 locale/en/ap                                  |  3 +-
 locale/en/ar                                  |  1 +
 locale/en/arap                                |  1 +
 locale/en/auth_enable_sales_all_edit          | 13 +++
 locale/en/bankaccounts                        |  1 +
 locale/en/bp                                  |  1 +
 locale/en/ca                                  |  1 +
 locale/en/common                              |  1 +
 locale/en/cp                                  |  4 +
 locale/en/cp_greeting_migration               |  1 +
 locale/en/ct                                  |  3 +
 locale/en/datev                               |  1 +
 locale/en/dn                                  |  2 +
 locale/en/do                                  |  8 +-
 locale/en/drafts                              |  1 +
 locale/en/fix_acc_trans_ap_taxkey_bug         | 14 ++++
 locale/en/fu                                  |  1 +
 locale/en/generictranslations                 |  1 +
 locale/en/gl                                  |  1 +
 locale/en/ic                                  |  3 +
 locale/en/io                                  |  2 +
 locale/en/ir                                  |  2 +
 locale/en/is                                  |  2 +
 locale/en/licenses                            |  1 +
 locale/en/login                               |  8 +-
 locale/en/lost                                |  6 +-
 locale/en/menu                                |  1 +
 locale/en/menuXML                             |  1 +
 locale/en/menujs                              |  1 +
 locale/en/menunew                             |  1 +
 locale/en/menuv3                              |  1 +
 locale/en/menuv4                              |  1 +
 locale/en/missing                             | 26 +++++-
 locale/en/oe                                  |  8 +-
 locale/en/pe                                  |  1 +
 locale/en/projects                            |  1 +
 locale/en/rc                                  |  1 +
 locale/en/reportgenerator                     |  1 +
 locale/en/rp                                  |  1 +
 locale/en/rundungsfehler_korrigieren_BUG1328  | 13 +++
 locale/en/sepa                                |  1 +
 locale/en/todo                                |  8 +-
 locale/en/ustva                               |  1 +
 locale/en/wh                                  |  2 +
 templates/webpages/admin/edit_user_en.html    | 42 ----------
 templates/webpages/ap/search_en.html          |  4 -
 templates/webpages/ar/search_en.html          | 10 +--
 .../webpages/common/show_vc_details_en.html   |  5 ++
 templates/webpages/ct/form_header_en.html     | 79 +++++++++++++++----
 templates/webpages/ct/get_delivery_en.html    | 12 ++-
 templates/webpages/ct/search_en.html          |  4 +-
 .../datev/net_gross_difference_en.html        | 27 +++++++
 .../SKR04_3804_already_exists_en.html         | 11 +++
 .../dbupgrade/SKR04_3804_update_en.html       | 12 +++
 .../webpages/dbupgrade/warehouse_form_en.html | 29 ++++---
 templates/webpages/do/form_header_en.html     | 10 +--
 templates/webpages/do/search_en.html          |  4 -
 templates/webpages/do/stock_in_form_en.html   | 23 ++++++
 templates/webpages/do/stock_out_form_en.html  |  3 +
 templates/webpages/dunning/search_en.html     |  2 +-
 .../webpages/dunning/show_invoices_en.html    |  7 +-
 .../webpages/generic/select_part_en.html      | 10 +++
 templates/webpages/ic/search_en.html          |  6 ++
 templates/webpages/ir/form_header_en.html     |  4 -
 templates/webpages/is/_payments_en.html       | 22 +++---
 templates/webpages/is/form_footer_en.html     |  3 +-
 templates/webpages/is/form_header_en.html     |  4 -
 templates/webpages/oe/form_header_en.html     |  4 -
 templates/webpages/oe/sales_order_en.html     | 13 ++-
 templates/webpages/oe/search_en.html          | 13 ++-
 templates/webpages/wh/journal_filter_en.html  | 16 ++++
 .../wh/removal_parts_selection_en.html        |  5 +-
 templates/webpages/wh/report_filter_en.html   | 20 +++++
 .../wh/transfer_parts_selection_en.html       |  3 +
 .../wh/warehouse_selection_assembly_en.html   | 19 +++++
 .../webpages/wh/warehouse_selection_en.html   | 20 +++++
 .../wh/warehouse_selection_stock_en.html      | 22 +++++-
 85 files changed, 521 insertions(+), 161 deletions(-)
 create mode 100644 locale/en/SKR04-3804-addition
 create mode 100644 locale/en/add_more_constraints_fibu_projekt_xplace
 create mode 100644 locale/en/auth_enable_sales_all_edit
 create mode 100644 locale/en/fix_acc_trans_ap_taxkey_bug
 create mode 100644 locale/en/rundungsfehler_korrigieren_BUG1328
 create mode 100644 templates/webpages/datev/net_gross_difference_en.html
 create mode 100644 templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html
 create mode 100644 templates/webpages/dbupgrade/SKR04_3804_update_en.html

diff --git a/locale/en/SKR04-3804-addition b/locale/en/SKR04-3804-addition
new file mode 100644
index 000000000..ddd7afc6a
--- /dev/null
+++ b/locale/en/SKR04-3804-addition
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Database update error:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+  'print_3804_already_exists'   => 'print_3804_already_exists',
+  'print_past_booking_warning'  => 'print_past_booking_warning',
+  'continue'                    => 'continue',
+};
+
+1;
diff --git a/locale/en/acctranscorrections b/locale/en/acctranscorrections
index cdd0e939e..27f9fc810 100644
--- a/locale/en/acctranscorrections
+++ b/locale/en/acctranscorrections
@@ -139,6 +139,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/add_more_constraints_fibu_projekt_xplace b/locale/en/add_more_constraints_fibu_projekt_xplace
new file mode 100644
index 000000000..ec02bb210
--- /dev/null
+++ b/locale/en/add_more_constraints_fibu_projekt_xplace
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Database update error:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+};
+
+1;
diff --git a/locale/en/admin b/locale/en/admin
index b5d555a7d..ef05d957b 100644
--- a/locale/en/admin
+++ b/locale/en/admin
@@ -183,6 +183,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/all b/locale/en/all
index 524bf2f9e..f48a950d5 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -252,6 +252,7 @@ $self->{texts} = {
   'Belegnummer'                 => '',
   'Beratername'                 => '',
   'Beraternummer'               => '',
+  'Best Before'                 => '',
   'Bestandskonto'               => '',
   'Bilanz'                      => '',
   'Billing Address'             => '',
@@ -442,6 +443,7 @@ $self->{texts} = {
   'Custom Variables'            => '',
   'Custom variables for module' => '',
   'Customer'                    => '',
+  'Customer Name'               => '',
   'Customer Number'             => '',
   'Customer Order Number'       => '',
   'Customer deleted!'           => '',
@@ -1079,6 +1081,7 @@ $self->{texts} = {
   'Number missing in Row'       => '',
   'Number of bins'              => '',
   'Number of copies'            => '',
+  'Number of entries changed: #1' => '',
   'Number of new bins'          => '',
   'Number pages'                => '',
   'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => '',
@@ -1095,6 +1098,7 @@ $self->{texts} = {
   'One or more Perl modules missing' => '',
   'Only due follow-ups'         => '',
   'Open'                        => '',
+  'Open Amount'                 => '',
   'Open amount'                 => '',
   'OpenDocument/OASIS'          => '',
   'Openings'                    => '',
@@ -1179,6 +1183,7 @@ $self->{texts} = {
   'Please insert your longdescription below' => '',
   'Please install the below listed modules or ask your system administrator to.' => '',
   'Please re-run the analysis for broken general ledger entries by clicking this button:' => '',
+  'Please read the file'        => '',
   'Please select a customer from the list below.' => '',
   'Please select a part from the list below.' => '',
   'Please select a vendor from the list below.' => '',
@@ -1313,6 +1318,7 @@ $self->{texts} = {
   'Report and misc. Preferences' => '',
   'Report for'                  => '',
   'Reports'                     => '',
+  'Representative'              => '',
   'Reqdate'                     => '',
   'Request for Quotation'       => '',
   'Request for Quotations'      => '',
@@ -1524,6 +1530,8 @@ $self->{texts} = {
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '',
   'The SEPA export has been created.' => '',
   'The access rights have been saved.' => '',
+  'The account 3804 already exists, the update will be skipped.' => '',
+  'The account 3804 will not be added automatically.' => '',
   'The assembly has been created.' => '',
   'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '',
   'The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
@@ -1636,7 +1644,10 @@ $self->{texts} = {
   'The wrong taxkeys for AP and AR transactions have been fixed.' => '',
   'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' => '',
   'The wrong taxkeys have been fixed.' => '',
+  '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 unfinished follow-ups of which #2 are due.' => '',
+  '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.' => '',
   'There are four tax zones.'   => '',
   'There are no items in stock.' => '',
   'There are no items on your TODO list at the moment.' => '',
@@ -1644,7 +1655,7 @@ $self->{texts} = {
   'There are usually three ways to install Perl modules.' => '',
   'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' => '',
   'There is at least one transaction for which the user has chosen a logically wrong taxkey.' => '',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => '',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => '',
   'There is not enough left of \'#1\' in bin \'#2\' for the removal of #3.' => '',
   'There is nothing to do in this step.' => '',
   'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' => '',
@@ -1698,6 +1709,7 @@ $self->{texts} = {
   'Transaction has been split on both the credit and the debit side' => '',
   'Transaction posted!'         => '',
   'Transactions, AR transactions, AP transactions' => '',
+  'Transdate'                   => '',
   'Transfer'                    => '',
   'Transfer Quantity'           => '',
   'Transfer To Stock'           => '',
@@ -1711,6 +1723,8 @@ $self->{texts} = {
   'Trying to call a sub without a name' => '',
   'Type'                        => '',
   'Type of Business'            => '',
+  'Type of Customer'            => '',
+  'Type of Vendor'              => '',
   'USTVA'                       => '',
   'USTVA 2004'                  => '',
   'USTVA 2005'                  => '',
@@ -1742,6 +1756,7 @@ $self->{texts} = {
   'Update'                      => '',
   'Update Dataset'              => '',
   'Update Prices'               => '',
+  'Update SKR04: new tax account 3804 (19%)' => '',
   'Update complete'             => '',
   'Update prices'               => '',
   'Update?'                     => '',
@@ -1755,6 +1770,7 @@ $self->{texts} = {
   'User migration complete'     => '',
   'User name'                   => '',
   'User saved!'                 => '',
+  'Username'                    => '',
   'Users in<br>this group'      => '',
   'Users not in this group'     => '',
   'Ust-IDNr'                    => '',
@@ -1765,7 +1781,9 @@ $self->{texts} = {
   'Vendor'                      => '',
   'Vendor Invoice'              => '',
   'Vendor Invoices'             => '',
+  'Vendor Name'                 => '',
   'Vendor Number'               => '',
+  'Vendor Order Number'         => '',
   'Vendor deleted!'             => '',
   'Vendor details'              => '',
   'Vendor missing!'             => '',
@@ -1779,12 +1797,12 @@ $self->{texts} = {
   'View License'                => '',
   'View SEPA export'            => '',
   'View warehouse content'      => '',
+  'View/edit all employees sales documents' => '',
   'Von Konto: '                 => '',
-  'WEBDAV access'               => '',
   'WHJournal'                   => '',
   'Warehouse'                   => '',
   'Warehouse From'              => '',
-  'Warehouse MIgration'         => '',
+  'Warehouse Migration'         => '',
   'Warehouse To'                => '',
   'Warehouse content'           => '',
   'Warehouse deleted.'          => '',
@@ -1871,6 +1889,7 @@ $self->{texts} = {
   'bank_transfer_payment_list_#1' => '',
   'bankaccounts'                => '',
   'banktransfers'               => '',
+  'bestbefore #1'               => '',
   'bin_list'                    => '',
   'bis'                         => '',
   'button'                      => '',
@@ -1931,6 +1950,7 @@ $self->{texts} = {
   'month'                       => '',
   'new Window'                  => '',
   'no'                          => '',
+  'no bestbefore'               => '',
   'no chargenumber'             => '',
   'none (pricegroup)'           => '',
   'not executed'                => '',
diff --git a/locale/en/am b/locale/en/am
index 48f3f1687..b9937cd98 100644
--- a/locale/en/am
+++ b/locale/en/am
@@ -250,6 +250,7 @@ $self->{texts} = {
   'Ranges of numbers and default accounts' => 'Ranges of numbers and default accounts',
   'Receipt, payment, reconciliation' => 'Receipt, payment, reconciliation',
   'Reports'                     => 'Reports',
+  'Representative'              => 'Representative',
   'Revenue'                     => 'Revenue',
   'Revenues EU with UStId'      => 'Revenues EU with UStId',
   'Revenues EU without UStId'   => 'Revenues EU without UStId',
@@ -314,6 +315,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse deleted.'          => 'Warehouse deleted.',
   'Warehouse management'        => 'Warehouse management',
   'Warehouse saved.'            => 'Warehouse saved.',
diff --git a/locale/en/amcvar b/locale/en/amcvar
index 7e699bce0..096efa54b 100644
--- a/locale/en/amcvar
+++ b/locale/en/amcvar
@@ -147,6 +147,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'Yes/No (Checkbox)'           => 'Yes/No (Checkbox)',
diff --git a/locale/en/amtemplates b/locale/en/amtemplates
index 1d92f23a1..5dc02bcea 100644
--- a/locale/en/amtemplates
+++ b/locale/en/amtemplates
@@ -144,6 +144,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'You\'re not editing a file.' => 'You\'re not editing a file.',
diff --git a/locale/en/ap b/locale/en/ap
index 7c864980a..db2f7df0e 100644
--- a/locale/en/ap
+++ b/locale/en/ap
@@ -104,6 +104,7 @@ $self->{texts} = {
   'Dunning'                     => 'Dunning',
   'ELSE'                        => 'ELSE',
   'Edit Accounts Payables Transaction' => 'Edit Creditor Transaction',
+  'Employee'                    => 'Employee',
   'Enter longdescription'       => 'Enter longdescription',
   'Error in database control file \'%s\': %s' => 'Error in database control file \'%s\': %s',
   'Exch'                        => 'Exch',
@@ -206,7 +207,6 @@ $self->{texts} = {
   'Sales Invoice'               => 'Sales Invoice',
   'Sales Order'                 => 'Sales Order',
   'Sales quotation'             => 'Sales quotation',
-  'Salesperson'                 => 'Salesperson',
   'Save draft'                  => 'Save draft',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -262,6 +262,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/ar b/locale/en/ar
index dfd94d0c1..37150516c 100644
--- a/locale/en/ar
+++ b/locale/en/ar
@@ -266,6 +266,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/arap b/locale/en/arap
index 0e68efa4a..59c5fa0ca 100644
--- a/locale/en/arap
+++ b/locale/en/arap
@@ -139,6 +139,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/auth_enable_sales_all_edit b/locale/en/auth_enable_sales_all_edit
new file mode 100644
index 000000000..ec02bb210
--- /dev/null
+++ b/locale/en/auth_enable_sales_all_edit
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Database update error:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+};
+
+1;
diff --git a/locale/en/bankaccounts b/locale/en/bankaccounts
index bdbc3e28b..8b394d7d3 100644
--- a/locale/en/bankaccounts
+++ b/locale/en/bankaccounts
@@ -142,6 +142,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'You have to fill in at least an account number, the bank code, the IBAN and the BIC.' => 'You have to fill in at least an account number, the bank code, the IBAN and the BIC.',
diff --git a/locale/en/bp b/locale/en/bp
index 9c8f30259..96237f657 100644
--- a/locale/en/bp
+++ b/locale/en/bp
@@ -160,6 +160,7 @@ $self->{texts} = {
   'Vendor'                      => 'Vendor',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/ca b/locale/en/ca
index afc8dbe4f..bffa04019 100644
--- a/locale/en/ca
+++ b/locale/en/ca
@@ -162,6 +162,7 @@ $self->{texts} = {
   'USt-Konto'                   => 'USt-Konto',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'YYYY'                        => 'YYYY',
   'Year'                        => 'Year',
diff --git a/locale/en/common b/locale/en/common
index cd099306a..7f32894eb 100644
--- a/locale/en/common
+++ b/locale/en/common
@@ -128,6 +128,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/cp b/locale/en/cp
index e0928c420..d63ef98a5 100644
--- a/locale/en/cp
+++ b/locale/en/cp
@@ -106,6 +106,7 @@ $self->{texts} = {
   'No or an unknown authenticantion module specified in "config/authentication.pl".' => 'No or an unknown authenticantion module specified in "config/authentication.pl".',
   'No part was found matching the search parameters.' => 'No part was found matching the search parameters.',
   'No vendor has been selected yet.' => 'No vendor has been selected yet.',
+  'Note'                        => 'Note',
   'Number'                      => 'Number',
   'Others'                      => 'Others',
   'PAYMENT POSTED'              => 'PAYMENT POSTED',
@@ -159,6 +160,8 @@ $self->{texts} = {
   'The connection to the authentication database failed:' => 'The connection to the authentication database failed:',
   'The connection to the template database failed:' => 'The connection to the template database failed:',
   'The creation of the authentication database failed:' => 'The creation of the authentication database failed:',
+  'There are #1 more open invoices for this customer with other currencies.' => '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 more open invoices from this vendor with other currencies.',
   'To (email)'                  => 'To (email)',
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Trying to call a sub without a name' => 'Trying to call a sub without a name',
@@ -172,6 +175,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/cp_greeting_migration b/locale/en/cp_greeting_migration
index 0f67c20de..e5f3dae60 100644
--- a/locale/en/cp_greeting_migration
+++ b/locale/en/cp_greeting_migration
@@ -5,6 +5,7 @@ $self->{texts} = {
 };
 
 $self->{subs} = {
+  'alter_schema_only'           => 'alter_schema_only',
   'do_query'                    => 'do_query',
   'do_update'                   => 'do_update',
   'migrate_data'                => 'migrate_data',
diff --git a/locale/en/ct b/locale/en/ct
index 8715bd96f..c0bae22b2 100644
--- a/locale/en/ct
+++ b/locale/en/ct
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Create and edit vendor invoices' => 'Create and edit vendor invoices',
   'Credit Note'                 => 'Credit Note',
   'Customer'                    => 'Customer',
+  'Customer Name'               => 'Customer Name',
   'Customer Number'             => 'Customer Number',
   'Customer deleted!'           => 'Customer deleted!',
   'Customer details'            => 'Customer details',
@@ -171,11 +172,13 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Vendor',
   'Vendor Invoice'              => 'Vendor Invoice',
+  'Vendor Name'                 => 'Vendor Name',
   'Vendor deleted!'             => 'Vendor deleted!',
   'Vendor details'              => 'Vendor details',
   'Vendor saved!'               => 'Vendor saved!',
   'Vendors'                     => 'Vendors',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/datev b/locale/en/datev
index 9677c3ea5..a95404f47 100644
--- a/locale/en/datev
+++ b/locale/en/datev
@@ -164,6 +164,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Von Konto: '                 => 'Von Konto: ',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/dn b/locale/en/dn
index 78643f823..cdfbc209a 100644
--- a/locale/en/dn
+++ b/locale/en/dn
@@ -265,6 +265,7 @@ $self->{texts} = {
   'Vendor Number'               => 'Vendor Number',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
@@ -340,6 +341,7 @@ $self->{subs} = {
   'quotation'                   => 'quotation',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report_generator_back'       => 'report_generator_back',
   'report_generator_dispatcher' => 'report_generator_dispatcher',
   'report_generator_do'         => 'report_generator_do',
diff --git a/locale/en/do b/locale/en/do
index 24cee46aa..74a4d7ced 100644
--- a/locale/en/do
+++ b/locale/en/do
@@ -108,6 +108,7 @@ $self->{texts} = {
   'ELSE'                        => 'ELSE',
   'Edit Purchase Delivery Order' => 'Edit Purchase Delivery Order',
   'Edit Sales Delivery Order'   => 'Edit Sales Delivery Order',
+  'Employee'                    => 'Employee',
   'Enter longdescription'       => 'Enter longdescription',
   'Error in database control file \'%s\': %s' => 'Error in database control file \'%s\': %s',
   'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.' => 'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.',
@@ -228,7 +229,6 @@ $self->{texts} = {
   'Sales Invoice'               => 'Sales Invoice',
   'Sales Order'                 => 'Sales Order',
   'Sales quotation'             => 'Sales quotation',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -262,7 +262,7 @@ $self->{texts} = {
   'The list has been printed.'  => 'The list has been printed.',
   'The parts for this delivery order have already been transferred in.' => 'The parts for this delivery order have already been transferred in.',
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.',
   'To (email)'                  => 'To (email)',
   'Transaction description'     => 'Transaction description',
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
@@ -280,6 +280,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You cannot create an invoice for delivery orders for different customers.' => 'You cannot create an invoice for delivery orders for different customers.',
@@ -289,6 +290,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
   'Zipcode'                     => 'Zipcode',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'bestbefore #1',
   'bin_list'                    => 'bin_list',
   'chargenumber #1'             => 'chargenumber #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Key "DB_config" is missing.',
@@ -299,6 +301,7 @@ $self->{texts} = {
   'emailed to'                  => 'emailed to',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'packing_list'                => 'packing_list',
@@ -381,6 +384,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report_generator_back'       => 'report_generator_back',
   'report_generator_dispatcher' => 'report_generator_dispatcher',
   'report_generator_do'         => 'report_generator_do',
diff --git a/locale/en/drafts b/locale/en/drafts
index c9f5af0de..d998532fe 100644
--- a/locale/en/drafts
+++ b/locale/en/drafts
@@ -131,6 +131,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/fix_acc_trans_ap_taxkey_bug b/locale/en/fix_acc_trans_ap_taxkey_bug
new file mode 100644
index 000000000..e1b660e97
--- /dev/null
+++ b/locale/en/fix_acc_trans_ap_taxkey_bug
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Database update error:',
+  'Number of entries changed: #1' => 'Number of entries changed: #1',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+};
+
+1;
diff --git a/locale/en/fu b/locale/en/fu
index 5d3b9d3af..cf98230d0 100644
--- a/locale/en/fu
+++ b/locale/en/fu
@@ -139,6 +139,7 @@ $self->{texts} = {
   'Vendor'                      => 'Vendor',
   'Vendor Invoice'              => 'Vendor Invoice',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/generictranslations b/locale/en/generictranslations
index 8c9fa62cf..ef903a1ff 100644
--- a/locale/en/generictranslations
+++ b/locale/en/generictranslations
@@ -102,6 +102,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/gl b/locale/en/gl
index bf4cb7f22..7c33cd864 100644
--- a/locale/en/gl
+++ b/locale/en/gl
@@ -246,6 +246,7 @@ $self->{texts} = {
   'Vendor Invoice'              => 'Vendor Invoice',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/ic b/locale/en/ic
index 140c9bfeb..8ecc4b9d8 100644
--- a/locale/en/ic
+++ b/locale/en/ic
@@ -287,6 +287,7 @@ $self->{texts} = {
   'Top 100'                     => 'Top 100',
   'Top 100 hinzufuegen'         => 'Top 100 hinzufuegen',
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
+  'Transdate'                   => 'Transdate',
   'Transfer To Stock'           => 'Transfer To Stock',
   'Trying to call a sub without a name' => 'Trying to call a sub without a name',
   'Unit'                        => 'Unit',
@@ -300,6 +301,7 @@ $self->{texts} = {
   'Vendor Number'               => 'Vendor Number',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Weight'                      => 'Weight',
   'Yes'                         => 'Yes',
@@ -396,6 +398,7 @@ $self->{subs} = {
   'quotation'                   => 'quotation',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report_generator_back'       => 'report_generator_back',
   'report_generator_dispatcher' => 'report_generator_dispatcher',
   'report_generator_do'         => 'report_generator_do',
diff --git a/locale/en/io b/locale/en/io
index f5744d6a2..9ee498646 100644
--- a/locale/en/io
+++ b/locale/en/io
@@ -231,6 +231,7 @@ $self->{texts} = {
   'Vendor Number'               => 'Vendor Number',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
@@ -298,6 +299,7 @@ $self->{subs} = {
   'quotation'                   => 'quotation',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_invoice'               => 'sales_invoice',
diff --git a/locale/en/ir b/locale/en/ir
index 9fdb38ba7..fdcc82b91 100644
--- a/locale/en/ir
+++ b/locale/en/ir
@@ -261,6 +261,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
@@ -351,6 +352,7 @@ $self->{subs} = {
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
   'remove_draft'                => 'remove_draft',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_invoice'               => 'sales_invoice',
diff --git a/locale/en/is b/locale/en/is
index e0e7df7ff..0c3a2eeac 100644
--- a/locale/en/is
+++ b/locale/en/is
@@ -264,6 +264,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
@@ -357,6 +358,7 @@ $self->{subs} = {
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
   'remove_draft'                => 'remove_draft',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_invoice'               => 'sales_invoice',
diff --git a/locale/en/licenses b/locale/en/licenses
index 4e65c94f2..145d4abe3 100644
--- a/locale/en/licenses
+++ b/locale/en/licenses
@@ -157,6 +157,7 @@ $self->{texts} = {
   'Vendor details'              => 'Vendor details',
   'View License'                => 'View License',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/login b/locale/en/login
index d38739d97..c0996563b 100644
--- a/locale/en/login
+++ b/locale/en/login
@@ -288,7 +288,6 @@ $self->{texts} = {
   'Sales Orders'                => 'Sales Orders',
   'Sales quotation'             => 'Sales quotation',
   'Salesman'                    => 'Salesman',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -328,7 +327,7 @@ $self->{texts} = {
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
   'The session is invalid or has expired.' => 'The session is invalid or has expired.',
   'The subject is missing.'     => 'The subject is missing.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.',
   'To (email)'                  => 'To (email)',
   'Total'                       => 'Total',
   'Transaction description'     => 'Transaction description',
@@ -338,6 +337,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Unit',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
+  'Valid until'                 => 'Valid until',
   'Value'                       => 'Value',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Vendor',
@@ -350,6 +350,7 @@ $self->{texts} = {
   'Vendor type'                 => 'Vendor type',
   'Version'                     => 'Version',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Workflow purchase_order'     => 'Workflow purchase_order',
   'Workflow request_quotation'  => 'Workflow request_quotation',
@@ -366,6 +367,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
   'Zipcode'                     => 'Zipcode',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'bestbefore #1',
   'bin_list'                    => 'bin_list',
   'chargenumber #1'             => 'chargenumber #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Key "DB_config" is missing.',
@@ -377,6 +379,7 @@ $self->{texts} = {
   'follow_up_list'              => 'follow_up_list',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'oe.pl::search called with unknown type' => 'oe.pl::search called with unknown type',
@@ -486,6 +489,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report'                      => 'report',
   'report_for_todo_list'        => 'report_for_todo_list',
   'report_generator_back'       => 'report_generator_back',
diff --git a/locale/en/lost b/locale/en/lost
index 5e165a9f0..4178095ed 100644
--- a/locale/en/lost
+++ b/locale/en/lost
@@ -4,9 +4,6 @@
 # This file will be auto-generated by locales.pl. Do not edit it.
 
 @lost = (
-  { 'text' => 'C', 'translation' => '' },
-  { 'text' => 'Sales', 'translation' => '' },
-  { 'text' => 'collected on sales', 'translation' => '' },
   { 'text' => 'GIFI deleted!', 'translation' => '' },
   { 'text' => 'Assemblies restocked!', 'translation' => '' },
   { 'text' => 'Amount does not equal applied!', 'translation' => '' },
@@ -54,6 +51,9 @@
   { 'text' => 'Retained Earnings', 'translation' => '' },
   { 'text' => 'Ship rcvd', 'translation' => '' },
   { 'text' => 'Ship', 'translation' => '' },
+  { 'text' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.', 'translation' => '' },
+  { 'text' => 'Warehouse MIgration', 'translation' => '' },
+  { 'text' => 'WEBDAV access', 'translation' => '' },
 );
 
 1;
diff --git a/locale/en/menu b/locale/en/menu
index a40506cee..53c2cb3e9 100644
--- a/locale/en/menu
+++ b/locale/en/menu
@@ -204,6 +204,7 @@ $self->{texts} = {
   'Vendors'                     => 'Vendors',
   'Version'                     => 'Version',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'WHJournal'                   => 'WHJournal',
   'Warehouse'                   => 'Warehouse',
   'Warehouse content'           => 'Warehouse content',
diff --git a/locale/en/menuXML b/locale/en/menuXML
index 35b47a188..e32f6ee69 100644
--- a/locale/en/menuXML
+++ b/locale/en/menuXML
@@ -70,6 +70,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/menujs b/locale/en/menujs
index 8eed10803..92a7da5ee 100644
--- a/locale/en/menujs
+++ b/locale/en/menujs
@@ -71,6 +71,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/menunew b/locale/en/menunew
index c25d1c337..0820d4006 100644
--- a/locale/en/menunew
+++ b/locale/en/menunew
@@ -203,6 +203,7 @@ $self->{texts} = {
   'Vendors'                     => 'Vendors',
   'Version'                     => 'Version',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'WHJournal'                   => 'WHJournal',
   'Warehouse'                   => 'Warehouse',
   'Warehouse content'           => 'Warehouse content',
diff --git a/locale/en/menuv3 b/locale/en/menuv3
index 56bc09371..9945921b0 100644
--- a/locale/en/menuv3
+++ b/locale/en/menuv3
@@ -70,6 +70,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/menuv4 b/locale/en/menuv4
index 56bc09371..9945921b0 100644
--- a/locale/en/menuv4
+++ b/locale/en/menuv4
@@ -70,6 +70,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/missing b/locale/en/missing
index 563cd2f40..da68055e8 100644
--- a/locale/en/missing
+++ b/locale/en/missing
@@ -239,6 +239,7 @@ $missing = {
   'Belegnummer'                 => '',
   'Beratername'                 => '',
   'Beraternummer'               => '',
+  'Best Before'                 => '',
   'Bestandskonto'               => '',
   'Bilanz'                      => '',
   'Billing Address'             => '',
@@ -428,6 +429,7 @@ $missing = {
   'Custom Variables'            => '',
   'Custom variables for module' => '',
   'Customer'                    => '',
+  'Customer Name'               => '',
   'Customer Number'             => '',
   'Customer Order Number'       => '',
   'Customer deleted!'           => '',
@@ -1063,6 +1065,7 @@ $missing = {
   'Number missing in Row'       => '',
   'Number of bins'              => '',
   'Number of copies'            => '',
+  'Number of entries changed: #1' => '',
   'Number of new bins'          => '',
   'Number pages'                => '',
   'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => '',
@@ -1079,6 +1082,7 @@ $missing = {
   'One or more Perl modules missing' => '',
   'Only due follow-ups'         => '',
   'Open'                        => '',
+  'Open Amount'                 => '',
   'Open amount'                 => '',
   'OpenDocument/OASIS'          => '',
   'Openings'                    => '',
@@ -1163,6 +1167,7 @@ $missing = {
   'Please insert your longdescription below' => '',
   'Please install the below listed modules or ask your system administrator to.' => '',
   'Please re-run the analysis for broken general ledger entries by clicking this button:' => '',
+  'Please read the file'        => '',
   'Please select a customer from the list below.' => '',
   'Please select a part from the list below.' => '',
   'Please select a vendor from the list below.' => '',
@@ -1297,6 +1302,7 @@ $missing = {
   'Report and misc. Preferences' => '',
   'Report for'                  => '',
   'Reports'                     => '',
+  'Representative'              => '',
   'Reqdate'                     => '',
   'Request for Quotation'       => '',
   'Request for Quotations'      => '',
@@ -1508,6 +1514,8 @@ $missing = {
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '',
   'The SEPA export has been created.' => '',
   'The access rights have been saved.' => '',
+  'The account 3804 already exists, the update will be skipped.' => '',
+  'The account 3804 will not be added automatically.' => '',
   'The assembly has been created.' => '',
   'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '',
   'The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '',
@@ -1620,7 +1628,10 @@ $missing = {
   'The wrong taxkeys for AP and AR transactions have been fixed.' => '',
   'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' => '',
   'The wrong taxkeys have been fixed.' => '',
+  '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 unfinished follow-ups of which #2 are due.' => '',
+  '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.' => '',
   'There are four tax zones.'   => '',
   'There are no items in stock.' => '',
   'There are no items on your TODO list at the moment.' => '',
@@ -1628,7 +1639,7 @@ $missing = {
   'There are usually three ways to install Perl modules.' => '',
   'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' => '',
   'There is at least one transaction for which the user has chosen a logically wrong taxkey.' => '',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => '',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => '',
   'There is not enough left of \'#1\' in bin \'#2\' for the removal of #3.' => '',
   'There is nothing to do in this step.' => '',
   'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' => '',
@@ -1682,6 +1693,7 @@ $missing = {
   'Transaction has been split on both the credit and the debit side' => '',
   'Transaction posted!'         => '',
   'Transactions, AR transactions, AP transactions' => '',
+  'Transdate'                   => '',
   'Transfer'                    => '',
   'Transfer Quantity'           => '',
   'Transfer To Stock'           => '',
@@ -1695,6 +1707,8 @@ $missing = {
   'Trying to call a sub without a name' => '',
   'Type'                        => '',
   'Type of Business'            => '',
+  'Type of Customer'            => '',
+  'Type of Vendor'              => '',
   'USTVA'                       => '',
   'USTVA 2004'                  => '',
   'USTVA 2005'                  => '',
@@ -1726,6 +1740,7 @@ $missing = {
   'Update'                      => '',
   'Update Dataset'              => '',
   'Update Prices'               => '',
+  'Update SKR04: new tax account 3804 (19%)' => '',
   'Update complete'             => '',
   'Update prices'               => '',
   'Update?'                     => '',
@@ -1739,6 +1754,7 @@ $missing = {
   'User migration complete'     => '',
   'User name'                   => '',
   'User saved!'                 => '',
+  'Username'                    => '',
   'Users in<br>this group'      => '',
   'Users not in this group'     => '',
   'Ust-IDNr'                    => '',
@@ -1749,7 +1765,9 @@ $missing = {
   'Vendor'                      => '',
   'Vendor Invoice'              => '',
   'Vendor Invoices'             => '',
+  'Vendor Name'                 => '',
   'Vendor Number'               => '',
+  'Vendor Order Number'         => '',
   'Vendor deleted!'             => '',
   'Vendor details'              => '',
   'Vendor missing!'             => '',
@@ -1763,12 +1781,12 @@ $missing = {
   'View License'                => '',
   'View SEPA export'            => '',
   'View warehouse content'      => '',
+  'View/edit all employees sales documents' => '',
   'Von Konto: '                 => '',
-  'WEBDAV access'               => '',
   'WHJournal'                   => '',
   'Warehouse'                   => '',
   'Warehouse From'              => '',
-  'Warehouse MIgration'         => '',
+  'Warehouse Migration'         => '',
   'Warehouse To'                => '',
   'Warehouse content'           => '',
   'Warehouse deleted.'          => '',
@@ -1855,6 +1873,7 @@ $missing = {
   'bank_transfer_payment_list_#1' => '',
   'bankaccounts'                => '',
   'banktransfers'               => '',
+  'bestbefore #1'               => '',
   'bin_list'                    => '',
   'bis'                         => '',
   'button'                      => '',
@@ -1915,6 +1934,7 @@ $missing = {
   'month'                       => '',
   'new Window'                  => '',
   'no'                          => '',
+  'no bestbefore'               => '',
   'no chargenumber'             => '',
   'none (pricegroup)'           => '',
   'not executed'                => '',
diff --git a/locale/en/oe b/locale/en/oe
index f14cbfe3c..2810b794e 100644
--- a/locale/en/oe
+++ b/locale/en/oe
@@ -266,7 +266,6 @@ $self->{texts} = {
   'Sales Orders'                => 'Sales Orders',
   'Sales quotation'             => 'Sales quotation',
   'Salesman'                    => 'Salesman',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -301,7 +300,7 @@ $self->{texts} = {
   'The list has been printed.'  => 'The list has been printed.',
   'The parts for this delivery order have already been transferred in.' => 'The parts for this delivery order have already been transferred in.',
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.',
   'To (email)'                  => 'To (email)',
   'Total'                       => 'Total',
   'Transaction description'     => 'Transaction description',
@@ -311,6 +310,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Unit',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
+  'Valid until'                 => 'Valid until',
   'Value'                       => 'Value',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Vendor',
@@ -322,6 +322,7 @@ $self->{texts} = {
   'Vendor not on file!'         => 'Vendor not on file!',
   'Vendor type'                 => 'Vendor type',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Workflow purchase_order'     => 'Workflow purchase_order',
   'Workflow request_quotation'  => 'Workflow request_quotation',
@@ -335,6 +336,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
   'Zipcode'                     => 'Zipcode',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'bestbefore #1',
   'bin_list'                    => 'bin_list',
   'chargenumber #1'             => 'chargenumber #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Key "DB_config" is missing.',
@@ -345,6 +347,7 @@ $self->{texts} = {
   'emailed to'                  => 'emailed to',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'oe.pl::search called with unknown type' => 'oe.pl::search called with unknown type',
@@ -446,6 +449,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report_for_todo_list'        => 'report_for_todo_list',
   'report_generator_back'       => 'report_generator_back',
   'report_generator_dispatcher' => 'report_generator_dispatcher',
diff --git a/locale/en/pe b/locale/en/pe
index b03a1b548..c881082c3 100644
--- a/locale/en/pe
+++ b/locale/en/pe
@@ -148,6 +148,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/projects b/locale/en/projects
index 146fb6c74..2ff71d689 100644
--- a/locale/en/projects
+++ b/locale/en/projects
@@ -149,6 +149,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/rc b/locale/en/rc
index a7d15d996..e7ad440c6 100644
--- a/locale/en/rc
+++ b/locale/en/rc
@@ -149,6 +149,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/reportgenerator b/locale/en/reportgenerator
index cfff57a0a..49cd94196 100644
--- a/locale/en/reportgenerator
+++ b/locale/en/reportgenerator
@@ -105,6 +105,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Transactions, AR transactions, AP transactions',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
diff --git a/locale/en/rp b/locale/en/rp
index e46c1fee9..04830f0fe 100644
--- a/locale/en/rp
+++ b/locale/en/rp
@@ -246,6 +246,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'YYYY'                        => 'YYYY',
   'Year'                        => 'Year',
diff --git a/locale/en/rundungsfehler_korrigieren_BUG1328 b/locale/en/rundungsfehler_korrigieren_BUG1328
new file mode 100644
index 000000000..ec02bb210
--- /dev/null
+++ b/locale/en/rundungsfehler_korrigieren_BUG1328
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Database update error:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+};
+
+1;
diff --git a/locale/en/sepa b/locale/en/sepa
index 742d910ae..ccfadfc2a 100644
--- a/locale/en/sepa
+++ b/locale/en/sepa
@@ -181,6 +181,7 @@ $self->{texts} = {
   'Vendor details'              => 'Vendor details',
   'View SEPA export'            => 'View SEPA export',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You do not have the permissions to access this function.' => 'You do not have the permissions to access this function.',
diff --git a/locale/en/todo b/locale/en/todo
index 61dd44488..14826608e 100644
--- a/locale/en/todo
+++ b/locale/en/todo
@@ -285,7 +285,6 @@ $self->{texts} = {
   'Sales Orders'                => 'Sales Orders',
   'Sales quotation'             => 'Sales quotation',
   'Salesman'                    => 'Salesman',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -324,7 +323,7 @@ $self->{texts} = {
   'The parts for this delivery order have already been transferred in.' => 'The parts for this delivery order have already been transferred in.',
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
   'The subject is missing.'     => 'The subject is missing.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.',
   'To (email)'                  => 'To (email)',
   'Total'                       => 'Total',
   'Transaction description'     => 'Transaction description',
@@ -334,6 +333,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Unit',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
+  'Valid until'                 => 'Valid until',
   'Value'                       => 'Value',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Vendor',
@@ -345,6 +345,7 @@ $self->{texts} = {
   'Vendor not on file!'         => 'Vendor not on file!',
   'Vendor type'                 => 'Vendor type',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Workflow purchase_order'     => 'Workflow purchase_order',
   'Workflow request_quotation'  => 'Workflow request_quotation',
@@ -359,6 +360,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
   'Zipcode'                     => 'Zipcode',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'bestbefore #1',
   'bin_list'                    => 'bin_list',
   'chargenumber #1'             => 'chargenumber #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Key "DB_config" is missing.',
@@ -370,6 +372,7 @@ $self->{texts} = {
   'follow_up_list'              => 'follow_up_list',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'oe.pl::search called with unknown type' => 'oe.pl::search called with unknown type',
@@ -475,6 +478,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report'                      => 'report',
   'report_for_todo_list'        => 'report_for_todo_list',
   'report_generator_back'       => 'report_generator_back',
diff --git a/locale/en/ustva b/locale/en/ustva
index 7999bd0c0..f182c80dd 100644
--- a/locale/en/ustva
+++ b/locale/en/ustva
@@ -179,6 +179,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Wrong Period'                => 'Wrong Period',
   'Year'                        => 'Year',
diff --git a/locale/en/wh b/locale/en/wh
index 5eb5e6576..5287e2dac 100644
--- a/locale/en/wh
+++ b/locale/en/wh
@@ -12,6 +12,7 @@ $self->{texts} = {
   'All reports'                 => 'All reports',
   'Attempt to call an undefined sub named \'%s\'' => 'Attempt to call an undefined sub named \'%s\'',
   'Bcc'                         => 'Bcc',
+  'Best Before'                 => 'Best Before',
   'Bin'                         => 'Bin',
   'Bin From'                    => 'Bin From',
   'Bin List'                    => 'Bin List',
@@ -186,6 +187,7 @@ $self->{texts} = {
   'Vendor Invoice'              => 'Vendor Invoice',
   'Vendor details'              => 'Vendor details',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'WHJournal'                   => 'WHJournal',
   'Warehouse'                   => 'Warehouse',
   'Warehouse From'              => 'Warehouse From',
diff --git a/templates/webpages/admin/edit_user_en.html b/templates/webpages/admin/edit_user_en.html
index a2de741cb..92719efe5 100644
--- a/templates/webpages/admin/edit_user_en.html
+++ b/templates/webpages/admin/edit_user_en.html
@@ -222,48 +222,6 @@
     </td>
    </tr>
 
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr class="listheading">
-    <th colspan="2">WEBDAV access</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">
-     <table>
-      <tr>
-       <td>
-        <input name="angebote" id="angebote"class="checkbox" type="checkbox" value="1" [% IF myc_angebote %]checked[% END %]>
-        <label for="angebote">&nbsp;Angebot</label>
-       </td>
-       <td>
-        <input name="bestellungen" id="bestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_bestellungen %]checked[% END %]>
-        <label for="bestellungen">&nbsp;Bestellung</label>
-       </td>
-       <td>
-        <input name="rechnungen" id="rechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_rechnungen %]checked[% END %]>
-        <label for="rechnungen">&nbsp;Rechnung</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="anfragen" id="anfragen" class="checkbox" type="checkbox" value="1" [% IF myc_anfragen %]checked[% END %]>
-        <label for="anfragen">&nbsp;Anfragen</label>
-       </td>
-       <td>
-        <input name="lieferantenbestellungen" id="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_lieferantenbestellungen %]checked[% END %]>
-        <label for="lieferantenbestellungen">&nbsp;Lieferantenbestellung</label>
-       </td>
-       <td>
-        <input name="einkaufsrechnungen" id="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_einkaufsrechnungen %]checked[% END %]>
-        <label for="einkaufsrechnungen">&nbsp;Einkaufsrechnung</label>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
    [% IF edit %]
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
diff --git a/templates/webpages/ap/search_en.html b/templates/webpages/ap/search_en.html
index 39425e804..b4ec8bf01 100644
--- a/templates/webpages/ap/search_en.html
+++ b/templates/webpages/ap/search_en.html
@@ -23,10 +23,6 @@
                  show_empty    = 1,
                  allow_textbox = 1,
                  -%]
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="vendor"]', params => { vc => 'vendor' } },
-]
-%]
       </td>
      </tr>
      <tr>
diff --git a/templates/webpages/ar/search_en.html b/templates/webpages/ar/search_en.html
index 289c27f54..7b7975fd1 100644
--- a/templates/webpages/ar/search_en.html
+++ b/templates/webpages/ar/search_en.html
@@ -1,4 +1,4 @@
-<body>
+<body
 
  <form method=post name="search" action=[% script %]>
 
@@ -23,10 +23,6 @@
                  show_empty    = 1,
                  allow_textbox = 1,
                  -%]
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="customer"]', params => { vc => 'customer' } },
-]
-%]
       </td>
      </tr>
      <tr>
@@ -116,11 +112,11 @@
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
            <td nowrap>Customer</td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
+           <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
            <td nowrap>Amount</td>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
            <td nowrap>Tax</td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
+           <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
            <td nowrap>Total</td>
           </tr>
           <tr>
diff --git a/templates/webpages/common/show_vc_details_en.html b/templates/webpages/common/show_vc_details_en.html
index 2ae56d84c..e597223da 100644
--- a/templates/webpages/common/show_vc_details_en.html
+++ b/templates/webpages/common/show_vc_details_en.html
@@ -34,8 +34,13 @@
 
  <table>
   <tr>
+  [% IF is_customer %]
    <td align="right">Customer Number</td>
    <td>[% HTML.escape(customernumber) %]</td>
+  [% ELSE %]
+   <td align="right">Vendor Number</td>
+   <td>[% HTML.escape(vendornumber) %]</td>
+  [% END %]
   </tr>
 
   <tr>
diff --git a/templates/webpages/ct/form_header_en.html b/templates/webpages/ct/form_header_en.html
index 1483d4d2e..0d33b7c09 100644
--- a/templates/webpages/ct/form_header_en.html
+++ b/templates/webpages/ct/form_header_en.html
@@ -1,4 +1,5 @@
-[% USE HTML %][% USE LxERP %]<body onLoad="fokus()">
+[% USE HTML %][% USE LxERP %]
+<body onLoad="fokus()">
 
  <div class="listtop">[% title %]</div>
 
@@ -21,6 +22,31 @@
 
     <table width="100%">
      <tr height="5"></tr>
+     [% IF conf_vertreter %]
+      <tr>
+       <th align="right">[% IF is_customer %]Type of Customer[%- ELSE %]Type of Vendor[%- END %]</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       </td>
+      </tr>
+      <tr>
+       <th align="right">Representative</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name      = 'salesman_id',
+              DATA      = ALL_SALESMAN_CUSTOMERS,
+              id_key    = 'id',
+              label_key = 'name',
+        -%]
+       </td>
+      </tr>
+     [%- END %]
      <tr>
       [%- IF is_customer %]
       <th align="right" nowrap>Customer Number</th>
@@ -46,7 +72,7 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Company Name</th>
+      <th align="right" nowrap>[% IF is_customer %]Customer Name[%- ELSE %]Vendor Name[%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 
@@ -153,17 +179,28 @@
       <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
      </tr>
 
+     [%- IF conf_vertreter %]
+      <tr>
+	     <th align="right">Username</th>
+	     <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
+ 	     <th align="right">Password</th>
+	     <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
+      </tr>
+     [%- END %]
+
      <tr>
-      <th align="right">Type of Business</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'business',
-             DATA       = all_business,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
+      [% UNLESS conf_vertreter %]
+       <th align="right">[% IF is_customer %]Type of Customer[% ELSE %]Type of Vendor[%- END %]</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       </td>
+      [%- END %]
       <th align="right">Language</th>
       <td>
        [%- INCLUDE generic/multibox.html
@@ -207,7 +244,7 @@
              label_key  = 'description',
        -%]
       </td>
-      [%- IF is_customer %]
+      [%- IF is_customer && !conf_vertreter %]
       <th align="right">Salesman</th>
       <td>
        [%- INCLUDE generic/multibox.html
@@ -326,7 +363,7 @@
              name       = 'cp_id',
              id         = 'cp_id',
              DATA       = CONTACTS,
-             onChange   = "get_contact(['cp_id__'+this.value],['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2','cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender])",
+             onChange   = "on_contact_changed()",
              id_key     = 'cp_id',
              label_sub  = 'contacts_label',
        -%]
@@ -350,6 +387,7 @@
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_title',
+             id         = 'selected_cp_title',
              DATA       = MB_TITLES,
              show_empty = 1,
              id_key     = 'id',
@@ -364,6 +402,7 @@
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_abteilung',
+             id         = 'selected_cp_abteilung',
              DATA       = MB_DEPARTMENT,
              show_empty = 1,
              id_key     = 'id',
@@ -596,6 +635,7 @@
 
   </div>
 
+  <script type="text/javascript" src="js/jquery.js"></script>
   <script type="text/javascript">
    <!--
    function set_gender(gender) {
@@ -604,9 +644,14 @@
        s.selectedIndex = (gender == 'f') ? 1 : 0;
      }
    }
+
+   function on_contact_changed() {
+     get_contact(['cp_id__' + $('#cp_id').attr('value')],
+                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
+                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
+     $('#selected_cp_title').attr('selectedIndex', 0);
+     $('#selected_cp_abteilung').attr('selectedIndex', 0);
+   }
   -->
 
   </script>
-
-
-
diff --git a/templates/webpages/ct/get_delivery_en.html b/templates/webpages/ct/get_delivery_en.html
index ce3f9fdcb..745e71dca 100644
--- a/templates/webpages/ct/get_delivery_en.html
+++ b/templates/webpages/ct/get_delivery_en.html
@@ -11,13 +11,21 @@
           <th class="listheading">Description</th>
           <th class="listheading">Qty</th>
           <th class="listheading">Unit</th>
+[%- IF is_customer %]
           <th class="listheading">Sell Price</th>
+[%- ELSE %]
+          <th class="listheading">Last Cost</th>
+[%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
+[%-
+    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
+                             :  ( row.invoice ? 'ir' : 'ap' )
+-%]
         <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='[% IF IS_CUSTOMER %]is[% ELSE %]ir[% END %].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='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</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='oe.pl?action=edit&type=[% IF 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>
           <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
diff --git a/templates/webpages/ct/search_en.html b/templates/webpages/ct/search_en.html
index d7a9e686f..7f5ab60c3 100644
--- a/templates/webpages/ct/search_en.html
+++ b/templates/webpages/ct/search_en.html
@@ -13,7 +13,7 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap>Company Name</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %]Customer Name[%- ELSE %]Vendor Name[%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
@@ -86,7 +86,7 @@
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">Company Name</label>
+        <label for="l_name">[% IF IS_CUSTOMER %]Customer Name[%- ELSE %]Vendor Name[%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
diff --git a/templates/webpages/datev/net_gross_difference_en.html b/templates/webpages/datev/net_gross_difference_en.html
new file mode 100644
index 000000000..98e963e74
--- /dev/null
+++ b/templates/webpages/datev/net_gross_difference_en.html
@@ -0,0 +1,27 @@
+[% USE HTML %][% USE LxERP %]
+
+<p>
+ <b>Hinweis:</b>
+</p>
+
+<p>
+ Lx-Office 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 Lx-Office angezeigten und die in den
+ DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
+
+ Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
+ Lx-Office 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 %]
+ solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
+ [% LxERP.format_amount(sum_net_gross_differences, 2) %].
+</p>
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html
new file mode 100644
index 000000000..e44f70d51
--- /dev/null
+++ b/templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html
@@ -0,0 +1,11 @@
+[% USE HTML %]<div class="listtop">Update SKR04: new tax account 3804 (19%)</div>
+
+<form action="[% script %]" method="POST">
+
+<p>The account 3804 already exists, the update will be skipped.</p>
+<p>Please read the filedoc/skr04-update-3804/skr04_3804_hinzufuegen.html.
+
+<input type="hidden" name="account_exists" value="1">
+<input type="submit" value="Continue">
+
+
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_en.html b/templates/webpages/dbupgrade/SKR04_3804_update_en.html
new file mode 100644
index 000000000..9b3f9ff0f
--- /dev/null
+++ b/templates/webpages/dbupgrade/SKR04_3804_update_en.html
@@ -0,0 +1,12 @@
+[% USE HTML %]<div class="listtop">Update SKR04: new tax account 3804 (19%)</div>
+
+<form action="[% script %]" method="POST">
+
+<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.</p>
+<p>The account 3804 will not be added automatically.</p>
+<p>Please read the filedoc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
+
+<input type="hidden" name="bookings_exist" value="1">
+<input type="submit" value="Continue">
+
+
diff --git a/templates/webpages/dbupgrade/warehouse_form_en.html b/templates/webpages/dbupgrade/warehouse_form_en.html
index bd3a1e2fa..cee294753 100644
--- a/templates/webpages/dbupgrade/warehouse_form_en.html
+++ b/templates/webpages/dbupgrade/warehouse_form_en.html
@@ -1,19 +1,24 @@
-[% USE HTML %]<div class="listtop">Warehouse MIgration</div>
+[% USE HTML %]
+<div class="listtop">Warehouse Migration</div>
 
 <form action="[% script %]" method="POST">
+ <p>
+  Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.
+  This update will change the nature the onhand of goods is tracked.
+  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
+ </p>
 
-<p>Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system. 
-This update will change the nature the onhand of goods is tracked. 
-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</p>
+ <p>Do you want to store the existing onhand values into a new warehouse?</p>
 
-<p>Do you want to store the existing onhand values into a new warehouse?</p>
-<input id=do_migrate_Y name=do_migrate type=radio value=Y>&nbsp;<label for=do_migrate_Y>Yes</label>
-<input id=do_migrate_N name=do_migrate type=radio value=N checked>&nbsp;<label for=do_migrate_N>No</label>
+ <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">Yes</label>
+ <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">No</label>
 
-<p>Please specify a description for the warehouse designated for these goods.</p>
-<input name=import_warehouse size=50>
+ <p>Please specify a description for the warehouse designated for these goods.</p>
+ <input 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.<p>
-<input name=bin_default 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.<p>
 
-<p><input type=submit value="Continue"></p>
+  <input name="bin_default" size="50">
+
+ <p><input type="submit" value="Continue"></p>
+</form>
diff --git a/templates/webpages/do/form_header_en.html b/templates/webpages/do/form_header_en.html
index 9ea838747..7110e1fe9 100644
--- a/templates/webpages/do/form_header_en.html
+++ b/templates/webpages/do/form_header_en.html
@@ -108,10 +108,6 @@
         <td>
          [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
          [%- ELSE %]
          <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
           [%- FOREACH row = ALL_VC %]
@@ -145,10 +141,6 @@
          </td>
         </tr>
         [%- END %]
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
 
         [%- IF ALL_SHIPTO.size %]
         <tr>
@@ -326,7 +318,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>Customer Order Number</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]Customer Order Number[% ELSE %]Vendor Order Number[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 
diff --git a/templates/webpages/do/search_en.html b/templates/webpages/do/search_en.html
index 32ef4a5c3..c8477cc22 100644
--- a/templates/webpages/do/search_en.html
+++ b/templates/webpages/do/search_en.html
@@ -33,10 +33,6 @@
      <td colspan="3">
       [%- UNLESS SHOW_VC_DROP_DOWN %]
       <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
       [%- ELSE %]
       <select name="[% vc %]" class="fixed_width">
        <option></option>
diff --git a/templates/webpages/do/stock_in_form_en.html b/templates/webpages/do/stock_in_form_en.html
index d15592155..6b95a4793 100644
--- a/templates/webpages/do/stock_in_form_en.html
+++ b/templates/webpages/do/stock_in_form_en.html
@@ -92,6 +92,7 @@
      <th class="listheading">Warehouse</th>
      <th class="listheading">Bin</th>
      <th class="listheading">Charge Number</th>
+     <th class="listheading">Best Before</th>
      <th align="right" class="listheading">Qty</th>
      <th align="right" class="listheading">Unit</th>
     </tr>
@@ -105,6 +106,7 @@
      <td>[% HTML.escape(row.warehouse_description) %]</td>
      <td>[% HTML.escape(row.bin_description) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
      <td>[% HTML.escape(row.unit) %]</td>
 
@@ -120,6 +122,12 @@
 
      <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
      <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
+
+     <td>
+       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
+     </td>
+
      <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
 
      <td>
@@ -149,6 +157,21 @@
   </p>
  </form>
 
+ [%- IF NOT delivered %]
+  <script type="text/javascript">
+    <!--
+    [%- FOREACH row = STOCK_INFO %]
+    Calendar.setup( {
+      inputField : "bestbefore_[% loop.count %]",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger_[% loop.count %]"
+    });
+    [%- END %]
+    //-->
+  </script>
+  [%- END %]
+
 </body>
 </html>
 
diff --git a/templates/webpages/do/stock_out_form_en.html b/templates/webpages/do/stock_out_form_en.html
index 09ee4b7b5..f2ad437ea 100644
--- a/templates/webpages/do/stock_out_form_en.html
+++ b/templates/webpages/do/stock_out_form_en.html
@@ -60,6 +60,7 @@
      <th class="listheading">Warehouse</th>
      <th class="listheading">Bin</th>
      <th class="listheading">Charge Number</th>
+     <th class="listheading">Best Before</th>
      [%- UNLESS delivered %]
      <th align="right" class="listheading">Available qty</th>
      [%- END %]
@@ -73,6 +74,7 @@
      <td>[% HTML.escape(row.warehousedescription) %]</td>
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
 
      [%- IF delivered %]
 
@@ -103,6 +105,7 @@
     <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="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
     [%- END %]
    </table>
   </p>
diff --git a/templates/webpages/dunning/search_en.html b/templates/webpages/dunning/search_en.html
index 770e7301c..2b3e8d8d6 100644
--- a/templates/webpages/dunning/search_en.html
+++ b/templates/webpages/dunning/search_en.html
@@ -28,7 +28,7 @@
 
       [% IF SHOW_DUNNING_LEVELS %]
        <tr>
-        <th align="right" nowrap>Next Dunning Level</th>
+        <th align="right" nowrap>Dunning Level</th>
         <td colspan="3">
          <select name="dunning_level">
           <option value=""></option>
diff --git a/templates/webpages/dunning/show_invoices_en.html b/templates/webpages/dunning/show_invoices_en.html
index 078ca3118..be49e6bdd 100644
--- a/templates/webpages/dunning/show_invoices_en.html
+++ b/templates/webpages/dunning/show_invoices_en.html
@@ -27,6 +27,7 @@
    <th class="listheading">Invdate</th>
    <th class="listheading">Inv. Duedate</th>
    <th class="listheading">Amount</th>
+   <th class="listheading">Open Amount</th>
    <th class="listheading">Dunning Duedate</th>
    <th class="listheading">Total Fees</th>
    <th class="listheading">Interest</th>
@@ -51,10 +52,14 @@
      <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 %]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="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">[% HTML.escape(row.invnumber) %]</td>
+     <td>
+      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
+      <a href="is.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 align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
+     <td align="right"><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.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
diff --git a/templates/webpages/generic/select_part_en.html b/templates/webpages/generic/select_part_en.html
index 0b8cb7ab0..c06a200f9 100644
--- a/templates/webpages/generic/select_part_en.html
+++ b/templates/webpages/generic/select_part_en.html
@@ -20,6 +20,9 @@
      [% IF has_charge %]
      <th class="listheading">Charge number</th>
      [% END %]
+     [% IF has_bestbefore %]
+     <th class="listheading">Best Before</th>
+     [% END %]
      [% IF has_ean %]
      <th class="listheading">EAN</th>
      [% END %]
@@ -49,6 +52,13 @@
       [% HTML.escape(part.chargenumber) %]
      </td>
      [% END %]
+     [% IF has_bestbefore %]
+     <td>
+      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
+      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
+      [% HTML.escape(part.bestbefore) %]
+     </td>
+     [% END %]
      [% IF has_ean %]
      <td>
       <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">
diff --git a/templates/webpages/ic/search_en.html b/templates/webpages/ic/search_en.html
index 09f6633f9..66c58704c 100644
--- a/templates/webpages/ic/search_en.html
+++ b/templates/webpages/ic/search_en.html
@@ -241,6 +241,10 @@
          </tr>
 
          <tr>
+          <td>
+           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_transdate">Transdate</label>
+          </td>
           <td>
            <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
            <label for="l_subtotal">Subtotal</label>
@@ -250,6 +254,8 @@
            <label for="l_soldtotal">soldtotal</label>
           </td>
           <td>
+           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
+           <label for="l_ean">EAN</label>
           </td>
          </tr>
 
diff --git a/templates/webpages/ir/form_header_en.html b/templates/webpages/ir/form_header_en.html
index fb3c52b47..5e2c7ace6 100644
--- a/templates/webpages/ir/form_header_en.html
+++ b/templates/webpages/ir/form_header_en.html
@@ -43,10 +43,6 @@
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
             <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% vc | html %]')">
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[id="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
           </td>
           <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
           <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
diff --git a/templates/webpages/is/_payments_en.html b/templates/webpages/is/_payments_en.html
index cacaae7e8..1c39b20e3 100644
--- a/templates/webpages/is/_payments_en.html
+++ b/templates/webpages/is/_payments_en.html
@@ -1,25 +1,25 @@
-[%- USE LxERP %]
+[%- USE LxERP %][% USE T8 %]
   <tr>
    <td>
     <table width="100%">
      <tr class="listheading">
 [% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">Payments</th>
+      <th colspan="6" class="listheading">[%- 'Payments' | $T8 %]</th>
 [% ELSE %]
-      <th colspan="6" class="listheading">Incoming Payments</th>
+      <th colspan="6" class="listheading">[%- 'Incoming Payments' | $T8 %]</th>
 [%- END %]
      </tr>
 
 
      <tr>
-      <th>Date</th>
-      <th>Source</th>
-      <th>Memo</th>
-      <th>Amount</th>
+      <th>[%- 'Date' | $T8 %]</th>
+      <th>[%- 'Source' | $T8 %]</th>
+      <th>[%- 'Memo' | $T8 %]</th>
+      <th>[%- 'Amount' | $T8 %]</th>
 [% IF show_exchangerate %]
-      <th>Exch</th>
+      <th>[%- 'Exch' | $T8 %]</th>
 [% END %]
-      <th>Account</th>
+      <th>[%- 'Account' | $T8 %]</th>
      </tr>
 
 
@@ -66,13 +66,13 @@
     <tr>
       <td></td>
       <td></td>
-      <td align="center">Total</td>
+      <td align="center">[%- 'Total' | $T8 %]</td>
       <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
     </tr>
     <tr>
       <td></td>
       <td></td>
-      <td align="center">Missing amount</td>
+      <td align="center">[%- 'Missing amount' | $T8 %]</td>
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
diff --git a/templates/webpages/is/form_footer_en.html b/templates/webpages/is/form_footer_en.html
index bb5b4607b..6b6114235 100644
--- a/templates/webpages/is/form_footer_en.html
+++ b/templates/webpages/is/form_footer_en.html
@@ -135,6 +135,7 @@
 [% END %]
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="Delete">
+    <input class="submit" type="submit" name="action" value="Post">
 [% END %]
 
   [%- UNLESS locked %]
@@ -167,7 +168,7 @@
 <input type="hidden" name="draft_id" value="[% draft_id %]">
 <input type="hidden" name="draft_description" value="[% draft_description %]">
 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
-
+<input type="hidden" name="gldate" value="[% gldate %]">
 </form>
 
 </body>
diff --git a/templates/webpages/is/form_header_en.html b/templates/webpages/is/form_header_en.html
index f808ab729..489c52900 100644
--- a/templates/webpages/is/form_header_en.html
+++ b/templates/webpages/is/form_header_en.html
@@ -43,10 +43,6 @@
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
             <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[id="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
           </td>
           <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
           <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
diff --git a/templates/webpages/oe/form_header_en.html b/templates/webpages/oe/form_header_en.html
index 40f9e9ae6..c1758678a 100644
--- a/templates/webpages/oe/form_header_en.html
+++ b/templates/webpages/oe/form_header_en.html
@@ -47,10 +47,6 @@
                            onChange      = "document.getElementById('update_button').click();" -%]
                       <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[id="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
                   </tr>
 [%- IF ALL_CONTACTS.size %]
                   <tr>
diff --git a/templates/webpages/oe/sales_order_en.html b/templates/webpages/oe/sales_order_en.html
index deebf6414..ed2df70c1 100644
--- a/templates/webpages/oe/sales_order_en.html
+++ b/templates/webpages/oe/sales_order_en.html
@@ -1,12 +1,11 @@
 [% USE HTML %]
 <tr>
  <td>
-  <input type="checkbox" id="cb_show_details" name="show_details" [%- IF show_details %] checked[% END %]>
-  <label for="cb_show_details">Show details</label><br>
+  <input type="button" id="cb_show_details" name="show_details" value='Show details'>
   <script type="text/javascript">
    $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
   </script>
-  <table width="100%">
+  <table id='display_row' width="100%">
    <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
     <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]
    </tr>
@@ -28,8 +27,6 @@
   </table>
  </td>
 </tr>
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ic.pl', column => 'description', selector => '[name^="description_"]' },
-  { script => 'ic.pl', column => 'partnumber',  selector => '[name^="partnumber_"]'  },
-]
-%]
+<script type='text/javascript'>
+  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
+</script>
diff --git a/templates/webpages/oe/search_en.html b/templates/webpages/oe/search_en.html
index fe150bdab..a4e1db7fe 100644
--- a/templates/webpages/oe/search_en.html
+++ b/templates/webpages/oe/search_en.html
@@ -1,4 +1,5 @@
 [%- USE HTML %]
+[%- USE T8 %]
 [%- SET vclabel = vc == 'customer' ? 'Customer' : 'Vendor' %]
 [%- SET vcnumberlabel = vc == 'customer' ? 'Customer Number' : 'Vendor Number' %]
 <body>
@@ -26,10 +27,6 @@
                  show_empty    = 1,
                  allow_textbox = 1,
                  -%]
-[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [
-  { script => 'ct.pl', column => 'name', selector => 'input[name="' _ vc _ '"]', params => { vc => vc } },
-]
-%]
      </td>
     </tr>
 [%- IF ALL_DEPARTMENTS.size %]
@@ -104,9 +101,9 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Order Date From</th>
+     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
      </td>
      <th align="right">Bis</th>
@@ -116,7 +113,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Delivery Date From</th>
+     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
       <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdatefrom id="trigger5" value=?>
@@ -170,7 +167,7 @@
         </td>
         <td>
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate">Required by</label>
+         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
         </td>
        </tr>
        <tr>
diff --git a/templates/webpages/wh/journal_filter_en.html b/templates/webpages/wh/journal_filter_en.html
index 6db37319b..9c577cfe8 100644
--- a/templates/webpages/wh/journal_filter_en.html
+++ b/templates/webpages/wh/journal_filter_en.html
@@ -104,6 +104,13 @@
         <th align="right" nowrap>Charge Number:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       <tr>
+        <th align="right" nowrap>Best Before:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
        <tr>
         <th align="right" nowrap>Transfer Quantity:</th>
         <td>
@@ -159,6 +166,8 @@
         <td nowrap><label for="l_partnumber">Part Number</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
         <td nowrap><label for="l_chargenumber">Charge Number</label></td>
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">Best Before</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
@@ -199,6 +208,13 @@
 
   <script type="text/javascript">
     <!--
+    Calendar.setup( {
+      inputField : "bestbefore",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger"
+    });
+
     Calendar.setup( {
       inputField : "fromdate",
       ifFormat :"[% myconfig_jsc_dateformat %]",
diff --git a/templates/webpages/wh/removal_parts_selection_en.html b/templates/webpages/wh/removal_parts_selection_en.html
index a3838fd78..b730253dc 100644
--- a/templates/webpages/wh/removal_parts_selection_en.html
+++ b/templates/webpages/wh/removal_parts_selection_en.html
@@ -22,7 +22,7 @@
 
     <tr>
      <td>Optional comment:</td>
-     <td><input name="comment" size="20"></td>
+     <td><input name="comment" size="60"></td>
     </tr>
    </table>
   </p>
@@ -34,6 +34,7 @@
      <th class="listheading">Part Number</th>
      <th class="listheading">Part Description</th>
      <th class="listheading">Charge Number</th>
+     <th class="listheading">Best Before</th>
      <th class="listheading">EAN</th>
      <th class="listheading">Available qty</th>
      <th class="listheading">Removal qty</th>
@@ -46,11 +47,13 @@
      <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) %]">
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td>
diff --git a/templates/webpages/wh/report_filter_en.html b/templates/webpages/wh/report_filter_en.html
index af9faf54c..e090018b4 100644
--- a/templates/webpages/wh/report_filter_en.html
+++ b/templates/webpages/wh/report_filter_en.html
@@ -104,6 +104,13 @@
         <th align="right" nowrap>Charge Number:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       <tr>
+        <th align="right" nowrap>Best Before:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
        <tr>
         <th align="right" nowrap>Qty in stock:</th>
         <td>
@@ -147,6 +154,8 @@
         <td nowrap><label for="l_partnumber">Part Number</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
         <td nowrap><label for="l_chargenumber">Charge Number</label></td>
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">Best Before</label></td>
        </tr>
 
        <tr><td colspan="4"><hr noshade height="1"></td></tr>
@@ -174,5 +183,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>
diff --git a/templates/webpages/wh/transfer_parts_selection_en.html b/templates/webpages/wh/transfer_parts_selection_en.html
index 633c85325..f2d5fa366 100644
--- a/templates/webpages/wh/transfer_parts_selection_en.html
+++ b/templates/webpages/wh/transfer_parts_selection_en.html
@@ -66,6 +66,7 @@
      <th class="listheading">Part Number</th>
      <th class="listheading">Part Description</th>
      <th class="listheading">Charge Number</th>
+     <th class="listheading">Best Before</th>
      <th class="listheading">EAN</th>
      <th class="listheading">Available qty</th>
      <th class="listheading" colspan="2">Transfer qty</th>
@@ -79,11 +80,13 @@
      <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) %]">
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
diff --git a/templates/webpages/wh/warehouse_selection_assembly_en.html b/templates/webpages/wh/warehouse_selection_assembly_en.html
index 9b6729f7f..095df6252 100644
--- a/templates/webpages/wh/warehouse_selection_assembly_en.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_en.html
@@ -105,6 +105,14 @@
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
+    <tr>
+     <th align="right" nowrap>Best Before</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+       </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>Quantity</th>
      <td>
@@ -131,5 +139,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>
diff --git a/templates/webpages/wh/warehouse_selection_en.html b/templates/webpages/wh/warehouse_selection_en.html
index 78a31782c..34914e70a 100644
--- a/templates/webpages/wh/warehouse_selection_en.html
+++ b/templates/webpages/wh/warehouse_selection_en.html
@@ -115,6 +115,15 @@
      <th align="right" nowrap>Charge number</th>
      <td><input name="chargenumber" size="30"></td>
     </tr>
+
+    <tr>
+     <th align="right" nowrap>Best Before</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>EAN</th>
      <td><input name="ean" size="30"></td>
@@ -127,5 +136,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>
diff --git a/templates/webpages/wh/warehouse_selection_stock_en.html b/templates/webpages/wh/warehouse_selection_stock_en.html
index 348592f2e..6b0076e21 100644
--- a/templates/webpages/wh/warehouse_selection_stock_en.html
+++ b/templates/webpages/wh/warehouse_selection_stock_en.html
@@ -104,6 +104,15 @@
      <th align="right" nowrap>Charge number</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
+
+    <tr>
+     <th align="right" nowrap>Best Before</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>EAN</th>
      <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
@@ -121,7 +130,7 @@
 
     <tr>
      <th align="right" nowrap>Optional comment</th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
+     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
    </table>
@@ -135,5 +144,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>
-- 
2.20.1