From: Sven Schöling Date: Mon, 12 Jul 2010 11:12:43 +0000 (+0200) Subject: Templates werden nicht mehr explizit übersetzt: *_master in * umbenannt X-Git-Tag: release-2.6.2beta1~331^2~3 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/b61f5c3df68e3a3b4fb6a8a287172b0989215748 Templates werden nicht mehr explizit übersetzt: *_master in * umbenannt Ersetzt commit 6e77701e6cefdfe61861e82dd500f8d9582c482c. Erzeugt durch: for file in `find templates | grep _master.html`; do git mv $file ${file/_master}; done --- diff --git a/templates/webpages/acctranscorrections/analyze_filter.html b/templates/webpages/acctranscorrections/analyze_filter.html new file mode 100644 index 000000000..867bbadfd --- /dev/null +++ b/templates/webpages/acctranscorrections/analyze_filter.html @@ -0,0 +1,52 @@ +[%- USE T8 %] +[% USE HTML %] + +

[% title %]

+ +

+ [% 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' | $T8 %] + [% 'These wrong entries cannot be fixed automatically.' | $T8 %] + [% 'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' | $T8 %] +

+ +
+ +

[% 'Time period for the analysis:' | $T8 %]

+ +

+ + + + + + + + + + +
+ [% 'Period:' | $T8 %] + [% 'from (time)' | $T8 %] + + + [% 'to (time)' | $T8 %] + + +
+

+ +

+ +

+ + +
+ + + + diff --git a/templates/webpages/acctranscorrections/analyze_filter_master.html b/templates/webpages/acctranscorrections/analyze_filter_master.html deleted file mode 100644 index 867bbadfd..000000000 --- a/templates/webpages/acctranscorrections/analyze_filter_master.html +++ /dev/null @@ -1,52 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -

[% title %]

- -

- [% 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' | $T8 %] - [% 'These wrong entries cannot be fixed automatically.' | $T8 %] - [% 'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' | $T8 %] -

- -
- -

[% 'Time period for the analysis:' | $T8 %]

- -

- - - - - - - - - - -
- [% 'Period:' | $T8 %] - [% 'from (time)' | $T8 %] - - - [% 'to (time)' | $T8 %] - - -
-

- -

- -

- - -
- - - - diff --git a/templates/webpages/acctranscorrections/analyze_overview.html b/templates/webpages/acctranscorrections/analyze_overview.html new file mode 100644 index 000000000..883c4e707 --- /dev/null +++ b/templates/webpages/acctranscorrections/analyze_overview.html @@ -0,0 +1,159 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + + +

[% title %]

+ +

[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]

+ +

+ [% 'Period' | $T8 %]: + [%- IF transdate_from || transdate_to %] + [%- IF transdate_from %] + [% 'from (time)' | $T8 %] [% transdate_from %] + [%- END %] + [%- IF transdate_to %] + [% 'to (time)' | $T8 %] [% transdate_to %] + [%- END %] + [%- ELSE %] + [% 'all entries' | $T8 %] + [%- END %] +

+ +

+ + + + + + + + [%- FOREACH problem = PROBLEMS %] + + + + + + + + [%- END %] + +
[% 'Transaction' | $T8 %][% 'Problem' | $T8 %][% 'Solution' | $T8 %]
+ [%- IF problem.type == 'ap_ar_wrong_taxkeys' %] + [%- IF problem.ap_problems.size %] + [% 'AP Transactions' | $T8 %] + [%- FOREACH ap = problem.ap_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(ap.data.reference) %] + [%- END %] + [%- END %] + + [%- IF problem.ar_problems.size %] + [%- IF problem.ap_problems.size %]; [%- END %] + [% 'AR Transactions' | $T8 %] + [%- FOREACH ar = problem.ar_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(ar.data.reference) %] + [%- END %] + [%- END %] + + + [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] + [%- IF problem.ar_problems.size %] + [% 'Sales invoices' | $T8 %] + [%- FOREACH subproblem = problem.ar_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(subproblem.data.reference) %] + [%- END %] + [%- END %] + + [%- IF problem.ap_problems.size %] + [%- IF problem.ar_problems.size %]; [%- END %] + [% 'Purchase invoices' | $T8 %] + [%- FOREACH subproblem = problem.ap_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(subproblem.data.reference) %] + [%- END %] + [%- END %] + + [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %] + [%- IF problem.ar_problems.size %] + [% 'Sales invoices' | $T8 %] + [%- FOREACH subproblem = problem.ar_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(subproblem.data.reference) %] + [%- END %] + [%- END %] + + [%- IF problem.ap_problems.size %] + [%- IF problem.ar_problems.size %]; [%- END %] + [% 'Purchase invoices' | $T8 %] + [%- FOREACH subproblem = problem.ap_problems %] + [%- UNLESS loop.first %], [%- END %] + [% HTML.escape(subproblem.data.reference) %] + [%- END %] + [%- END %] + + [%- ELSE %] + + + [%- IF problem.data.module == 'ar' %] + [% 'AR Transaction' | $T8 %] + [%- ELSIF problem.data.module == 'ap' %] + [% 'AP Transaction' | $T8 %] + [%- ELSE %] + [% 'General Ledger Transaction' | $T8 %] + [%- END %] + [% HTML.escape(problem.data.reference) %] + + + + + [%- END %] + + [%- IF problem.type == 'split_multiple_credit_and_debit' %] + [% 'Transaction has been split on both the credit and the debit side' | $T8 %] + + [%- ELSIF problem.type == 'wrong_taxkeys' %] + [% 'Wrong tax keys recorded' | $T8 %] + + [%- ELSIF problem.type == 'wrong_taxes' %] + [% 'Wrong taxes recorded' | $T8 %] + + [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %] + [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %] + + [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] + [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %] + + [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %] + [% 'Missing taxkeys in invoices with taxes.' | $T8 %] + + [%- END %] + + [%- IF problem.type == 'split_multiple_credit_and_debit' %] + [% 'This transaction has to be split into several transactions manually.' | $T8 %] + + [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %] + + [% 'Start the correction assistant' | $T8 %] + + + [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %] + + [% 'Start the correction assistant' | $T8 %] + + + [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] + + [% 'Start the correction assistant' | $T8 %] + + + [%- END %] +
+

+ +
+ + + diff --git a/templates/webpages/acctranscorrections/analyze_overview_master.html b/templates/webpages/acctranscorrections/analyze_overview_master.html deleted file mode 100644 index 883c4e707..000000000 --- a/templates/webpages/acctranscorrections/analyze_overview_master.html +++ /dev/null @@ -1,159 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - - -

[% title %]

- -

[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]

- -

- [% 'Period' | $T8 %]: - [%- IF transdate_from || transdate_to %] - [%- IF transdate_from %] - [% 'from (time)' | $T8 %] [% transdate_from %] - [%- END %] - [%- IF transdate_to %] - [% 'to (time)' | $T8 %] [% transdate_to %] - [%- END %] - [%- ELSE %] - [% 'all entries' | $T8 %] - [%- END %] -

- -

- - - - - - - - [%- FOREACH problem = PROBLEMS %] - - - - - - - - [%- END %] - -
[% 'Transaction' | $T8 %][% 'Problem' | $T8 %][% 'Solution' | $T8 %]
- [%- IF problem.type == 'ap_ar_wrong_taxkeys' %] - [%- IF problem.ap_problems.size %] - [% 'AP Transactions' | $T8 %] - [%- FOREACH ap = problem.ap_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(ap.data.reference) %] - [%- END %] - [%- END %] - - [%- IF problem.ar_problems.size %] - [%- IF problem.ap_problems.size %]; [%- END %] - [% 'AR Transactions' | $T8 %] - [%- FOREACH ar = problem.ar_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(ar.data.reference) %] - [%- END %] - [%- END %] - - - [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] - [%- IF problem.ar_problems.size %] - [% 'Sales invoices' | $T8 %] - [%- FOREACH subproblem = problem.ar_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(subproblem.data.reference) %] - [%- END %] - [%- END %] - - [%- IF problem.ap_problems.size %] - [%- IF problem.ar_problems.size %]; [%- END %] - [% 'Purchase invoices' | $T8 %] - [%- FOREACH subproblem = problem.ap_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(subproblem.data.reference) %] - [%- END %] - [%- END %] - - [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %] - [%- IF problem.ar_problems.size %] - [% 'Sales invoices' | $T8 %] - [%- FOREACH subproblem = problem.ar_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(subproblem.data.reference) %] - [%- END %] - [%- END %] - - [%- IF problem.ap_problems.size %] - [%- IF problem.ar_problems.size %]; [%- END %] - [% 'Purchase invoices' | $T8 %] - [%- FOREACH subproblem = problem.ap_problems %] - [%- UNLESS loop.first %], [%- END %] - [% HTML.escape(subproblem.data.reference) %] - [%- END %] - [%- END %] - - [%- ELSE %] - - - [%- IF problem.data.module == 'ar' %] - [% 'AR Transaction' | $T8 %] - [%- ELSIF problem.data.module == 'ap' %] - [% 'AP Transaction' | $T8 %] - [%- ELSE %] - [% 'General Ledger Transaction' | $T8 %] - [%- END %] - [% HTML.escape(problem.data.reference) %] - - - - - [%- END %] - - [%- IF problem.type == 'split_multiple_credit_and_debit' %] - [% 'Transaction has been split on both the credit and the debit side' | $T8 %] - - [%- ELSIF problem.type == 'wrong_taxkeys' %] - [% 'Wrong tax keys recorded' | $T8 %] - - [%- ELSIF problem.type == 'wrong_taxes' %] - [% 'Wrong taxes recorded' | $T8 %] - - [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %] - [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %] - - [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] - [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %] - - [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %] - [% 'Missing taxkeys in invoices with taxes.' | $T8 %] - - [%- END %] - - [%- IF problem.type == 'split_multiple_credit_and_debit' %] - [% 'This transaction has to be split into several transactions manually.' | $T8 %] - - [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %] - - [% 'Start the correction assistant' | $T8 %] - - - [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %] - - [% 'Start the correction assistant' | $T8 %] - - - [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %] - - [% 'Start the correction assistant' | $T8 %] - - - [%- END %] -
-

- -
- - - diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html new file mode 100644 index 000000000..6115d92cb --- /dev/null +++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html @@ -0,0 +1,32 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + + +

[% title %]

+ +

+ [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %] + + [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %] +

+ +

+ [% 'Lx-Office can fix these problems automatically.' | $T8 %] + + [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %] + + [% 'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' | $T8 %] +

+ +
+ +

+ + + + +

+
+ + + diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html deleted file mode 100644 index 6115d92cb..000000000 --- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html +++ /dev/null @@ -1,32 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - - -

[% title %]

- -

- [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %] - - [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %] -

- -

- [% 'Lx-Office can fix these problems automatically.' | $T8 %] - - [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %] - - [% 'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' | $T8 %] -

- -
- -

- - - - -

-
- - - diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html new file mode 100644 index 000000000..a0fa6586c --- /dev/null +++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html @@ -0,0 +1,28 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + + +

[% title %]

+ +

+ [% '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.' | $T8 %] +

+ +

+ [% 'Lx-Office can fix these problems automatically.' | $T8 %] + + [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %] +

+ +
+ +

+ + + + +

+
+ + + diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html deleted file mode 100644 index a0fa6586c..000000000 --- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html +++ /dev/null @@ -1,28 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - - -

[% title %]

- -

- [% '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.' | $T8 %] -

- -

- [% 'Lx-Office can fix these problems automatically.' | $T8 %] - - [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %] -

- -
- -

- - - - -

-
- - - diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html new file mode 100644 index 000000000..1195f287e --- /dev/null +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html @@ -0,0 +1,81 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + + +

[% title %]

+ +

+ [% 'The following transaction contains wrong taxes:' | $T8 %] + + [%- IF problem.data.module == 'ar' %] + [% 'AR Transaction' | $T8 %] + [%- ELSIF problem.data.module == 'ap' %] + [% 'AP Transaction' | $T8 %] + [%- ELSE %] + [% 'General Ledger Transaction' | $T8 %] + [%- END %] + [% HTML.escape(problem.data.reference) %] + +

+ +

[% 'At the moment the transaction looks like this:' | $T8 %]

+ +

+ + + + + + + + + + + + [%- SET curr_row = 0 %] + [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] + [%- SET order = [ 'credit', 'debit' ] %] + [%- SET other_side = 'debit' %] + [%- ELSE %] + [%- SET order = [ 'debit', 'credit' ] %] + [%- SET other_side = 'credit' %] + [%- END %] + + [%- FOREACH idx = order %] + [%- FOREACH row = problem.acc_trans.$idx.entries %] + [%- SET curr_row = curr_row + 1 %] + + + + + + + + + + [%- END %] + [%- END %] + +
[% 'Account' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Taxkey' | $T8 %][% 'Recorded Tax' | $T8 %][% 'Expected Tax' | $T8 %]
[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %] + [%- IF idx == 'debit' %] + [% LxERP.format_amount(row.display_amount, 2) %] + [%- END %] + + [%- IF idx == 'credit' %] + [% LxERP.format_amount(row.display_amount, 2) %] + [%- END %] + [% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %][% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %][% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]
+

+
+ +
+

+ + + + +

+
+ + + diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html deleted file mode 100644 index 1195f287e..000000000 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html +++ /dev/null @@ -1,81 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - - -

[% title %]

- -

- [% 'The following transaction contains wrong taxes:' | $T8 %] - - [%- IF problem.data.module == 'ar' %] - [% 'AR Transaction' | $T8 %] - [%- ELSIF problem.data.module == 'ap' %] - [% 'AP Transaction' | $T8 %] - [%- ELSE %] - [% 'General Ledger Transaction' | $T8 %] - [%- END %] - [% HTML.escape(problem.data.reference) %] - -

- -

[% 'At the moment the transaction looks like this:' | $T8 %]

- -

- - - - - - - - - - - - [%- SET curr_row = 0 %] - [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] - [%- SET order = [ 'credit', 'debit' ] %] - [%- SET other_side = 'debit' %] - [%- ELSE %] - [%- SET order = [ 'debit', 'credit' ] %] - [%- SET other_side = 'credit' %] - [%- END %] - - [%- FOREACH idx = order %] - [%- FOREACH row = problem.acc_trans.$idx.entries %] - [%- SET curr_row = curr_row + 1 %] - - - - - - - - - - [%- END %] - [%- END %] - -
[% 'Account' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Taxkey' | $T8 %][% 'Recorded Tax' | $T8 %][% 'Expected Tax' | $T8 %]
[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %] - [%- IF idx == 'debit' %] - [% LxERP.format_amount(row.display_amount, 2) %] - [%- END %] - - [%- IF idx == 'credit' %] - [% LxERP.format_amount(row.display_amount, 2) %] - [%- END %] - [% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %][% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %][% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]
-

-
- -
-

- - - - -

-
- - - diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html new file mode 100644 index 000000000..430f0fc8a --- /dev/null +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html @@ -0,0 +1,146 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + + +

[% title %]

+ +

+ [% 'The following transaction contains wrong taxkeys:' | $T8 %] + + [%- IF problem.data.module == 'ar' %] + [% 'AR Transaction' | $T8 %] + [%- ELSIF problem.data.module == 'ap' %] + [% 'AP Transaction' | $T8 %] + [%- ELSE %] + [% 'General Ledger Transaction' | $T8 %] + [%- END %] + [% HTML.escape(problem.data.reference) %] + +

+ +

+ [% 'This could have happened for two reasons:' | $T8 %] + + [% 'The first reason is that Lx-Office contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %] + + [% 'The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %] + + [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %] +

+ +

+ [% 'The transaction is shown below in its current state.' | $T8 %] + + [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %] + + [%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %] +

+ +

+ [% 'You can also delete this transaction and re-enter it manually.' | $T8 %] + + [% 'In order to do that hit the button "Delete transaction".' | $T8 %] +

+ +

[% 'At the moment the transaction looks like this:' | $T8 %]

+ +
+

+ + + + + + + + + + + + + [%- SET curr_row = 0 %] + [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %] + [%- SET order = [ 'credit', 'debit' ] %] + [%- SET other_side = 'debit' %] + [%- ELSE %] + [%- SET order = [ 'debit', 'credit' ] %] + [%- SET other_side = 'credit' %] + [%- END %] + + + [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] + [%- ELSE %] + [%- END %] + + + [%- FOREACH idx = order %] + [%- FOREACH row = problem.acc_trans.$idx.entries %] + [%- SET curr_row = curr_row + 1 %] + + + + + + + + + + + [%- END %] + [%- END %] + +
[% 'Account' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Recorded Tax' | $T8 %][% 'Recorded taxkey' | $T8 %][% 'Expected Tax' | $T8 %][% 'Correct taxkey' | $T8 %]
[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %] + [%- IF idx == 'debit' %] + [% LxERP.format_amount(row.display_amount, 2) %] + [%- END %] + + [%- IF idx == 'credit' %] + [% LxERP.format_amount(row.display_amount, 2) %] + [%- END %] + [% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %][% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %][% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %] + [%- IF row.taxkey_error %] + + +
+

+
+ +

+ + + + + + + + + +

+
+ + + + + + diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html deleted file mode 100644 index 430f0fc8a..000000000 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html +++ /dev/null @@ -1,146 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - - -

[% title %]

- -

- [% 'The following transaction contains wrong taxkeys:' | $T8 %] - - [%- IF problem.data.module == 'ar' %] - [% 'AR Transaction' | $T8 %] - [%- ELSIF problem.data.module == 'ap' %] - [% 'AP Transaction' | $T8 %] - [%- ELSE %] - [% 'General Ledger Transaction' | $T8 %] - [%- END %] - [% HTML.escape(problem.data.reference) %] - -

- -

- [% 'This could have happened for two reasons:' | $T8 %] - - [% 'The first reason is that Lx-Office contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %] - - [% 'The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %] - - [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %] -

- -

- [% 'The transaction is shown below in its current state.' | $T8 %] - - [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %] - - [%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %] -

- -

- [% 'You can also delete this transaction and re-enter it manually.' | $T8 %] - - [% 'In order to do that hit the button "Delete transaction".' | $T8 %] -

- -

[% 'At the moment the transaction looks like this:' | $T8 %]

- -
-

- - - - - - - - - - - - - [%- SET curr_row = 0 %] - [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %] - [%- SET order = [ 'credit', 'debit' ] %] - [%- SET other_side = 'debit' %] - [%- ELSE %] - [%- SET order = [ 'debit', 'credit' ] %] - [%- SET other_side = 'credit' %] - [%- END %] - - - [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %] - [%- ELSE %] - [%- END %] - - - [%- FOREACH idx = order %] - [%- FOREACH row = problem.acc_trans.$idx.entries %] - [%- SET curr_row = curr_row + 1 %] - - - - - - - - - - - [%- END %] - [%- END %] - -
[% 'Account' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Recorded Tax' | $T8 %][% 'Recorded taxkey' | $T8 %][% 'Expected Tax' | $T8 %][% 'Correct taxkey' | $T8 %]
[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %] - [%- IF idx == 'debit' %] - [% LxERP.format_amount(row.display_amount, 2) %] - [%- END %] - - [%- IF idx == 'credit' %] - [% LxERP.format_amount(row.display_amount, 2) %] - [%- END %] - [% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %][% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %][% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %] - [%- IF row.taxkey_error %] - - -
-

-
- -

- - - - - - - - - -

-
- - - - - - diff --git a/templates/webpages/acctranscorrections/delete_transaction.html b/templates/webpages/acctranscorrections/delete_transaction.html new file mode 100644 index 000000000..2c461b04f --- /dev/null +++ b/templates/webpages/acctranscorrections/delete_transaction.html @@ -0,0 +1,26 @@ +[%- USE T8 %] +[% USE HTML %] +[% USE LxERP %] + +

[% title %]

+ +

+ [%- IF module == 'ar' %] + [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %] + [%- ELSIF module == 'ap' %] + [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %] + [%- ELSE %] + [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %] + [%- END %] +

+ +

+

+ + + + +
+

+ + diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation.html new file mode 100644 index 000000000..c07547135 --- /dev/null +++ b/templates/webpages/acctranscorrections/delete_transaction_confirmation.html @@ -0,0 +1,33 @@ +[%- USE T8 %] +[% USE HTML %] +[% USE LxERP %] + +

[% title %]

+ +

+ [%- IF module == 'ar' %] + [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %] + [%- ELSIF module == 'ap' %] + [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %] + [%- ELSE %] + [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %] + [%- END %] +

+ +

+

+ + + + + + + + + + + +
+

+ + diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html deleted file mode 100644 index c07547135..000000000 --- a/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html +++ /dev/null @@ -1,33 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] -[% USE LxERP %] - -

[% title %]

- -

- [%- IF module == 'ar' %] - [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %] - [%- ELSIF module == 'ap' %] - [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %] - [%- ELSE %] - [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %] - [%- END %] -

- -

-

- - - - - - - - - - - -
-

- - diff --git a/templates/webpages/acctranscorrections/delete_transaction_master.html b/templates/webpages/acctranscorrections/delete_transaction_master.html deleted file mode 100644 index 2c461b04f..000000000 --- a/templates/webpages/acctranscorrections/delete_transaction_master.html +++ /dev/null @@ -1,26 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] -[% USE LxERP %] - -

[% title %]

- -

- [%- IF module == 'ar' %] - [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %] - [%- ELSIF module == 'ap' %] - [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %] - [%- ELSE %] - [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %] - [%- END %] -

- -

-

- - - - -
-

- - diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html new file mode 100644 index 000000000..f0999282f --- /dev/null +++ b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html @@ -0,0 +1,23 @@ +[%- USE T8 %] +[% USE HTML %] + + +

[% title %]

+ +

+ [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %] + + [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] +

+ +

+

+ + + + +
+

+ + + diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html deleted file mode 100644 index f0999282f..000000000 --- a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html +++ /dev/null @@ -1,23 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - - -

[% title %]

- -

- [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %] - - [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] -

- -

-

- - - - -
-

- - - diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html new file mode 100644 index 000000000..ee0c244a6 --- /dev/null +++ b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html @@ -0,0 +1,23 @@ +[%- USE T8 %] +[% USE HTML %] + + +

[% title %]

+ +

+ [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %] + + [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] +

+ +

+

+ + + + +
+

+ + + diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html deleted file mode 100644 index ee0c244a6..000000000 --- a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html +++ /dev/null @@ -1,23 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - - -

[% title %]

- -

- [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %] - - [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] -

- -

-

- - - - -
-

- - - diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html new file mode 100644 index 000000000..7a3f04434 --- /dev/null +++ b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html @@ -0,0 +1,23 @@ +[%- USE T8 %] +[% USE HTML %] + + +

[% title %]

+ +

+ [% 'The wrong taxkeys have been fixed.' | $T8 %] + + [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] +

+ +

+

+ + + + +
+

+ + + diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html deleted file mode 100644 index 7a3f04434..000000000 --- a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html +++ /dev/null @@ -1,23 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - - -

[% title %]

- -

- [% 'The wrong taxkeys have been fixed.' | $T8 %] - - [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %] -

- -

-

- - - - -
-

- - - diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html new file mode 100644 index 000000000..e82187431 --- /dev/null +++ b/templates/webpages/admin/adminlogin.html @@ -0,0 +1,34 @@ +[%- USE T8 %] +[% USE HTML %] + +
+ + + +

[% 'Version' | $T8 %] [% HTML.escape(version) %]

+ +

[% 'Administration' | $T8 %]

+ + [% IF error_message %] +

[% error_message %]

+ [% END %] + +
+ + + + + + + + +
[% 'Password' | $T8 %]
+ +
+ +

[% 'Lx-Office website' | $T8 %]

+ +
+ + + diff --git a/templates/webpages/admin/adminlogin_master.html b/templates/webpages/admin/adminlogin_master.html deleted file mode 100644 index e82187431..000000000 --- a/templates/webpages/admin/adminlogin_master.html +++ /dev/null @@ -1,34 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -
- - - -

[% 'Version' | $T8 %] [% HTML.escape(version) %]

- -

[% 'Administration' | $T8 %]

- - [% IF error_message %] -

[% error_message %]

- [% END %] - -
- - - - - - - - -
[% 'Password' | $T8 %]
- -
- -

[% 'Lx-Office website' | $T8 %]

- -
- - - diff --git a/templates/webpages/admin/backup_dataset.html b/templates/webpages/admin/backup_dataset.html new file mode 100644 index 000000000..073774187 --- /dev/null +++ b/templates/webpages/admin/backup_dataset.html @@ -0,0 +1,97 @@ +[%- USE T8 %] +[% USE HTML %] + + + +

[% title %]

+ + [% IF NO_DATABSES %] + [% 'No databases have been found on this server.' | $T8 %] + + [% ELSE %] + +
+ + + + + + + +

+ [% 'Please select the database you want to backup' | $T8 %]: + +

+ + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'From' | $T8 %]
[% 'To' | $T8 %]
[% 'Cc' | $T8 %]
[% 'Subject' | $T8 %]
[% 'Message' | $T8 %]
+ +
+ + + + + +
+ +
+ + + + +
+ + [% END %] + + + diff --git a/templates/webpages/admin/backup_dataset_email_done.html b/templates/webpages/admin/backup_dataset_email_done.html new file mode 100644 index 000000000..68f31d771 --- /dev/null +++ b/templates/webpages/admin/backup_dataset_email_done.html @@ -0,0 +1,14 @@ +[%- USE T8 %] +[%- USE LxERP %] +[% USE HTML %] + +

[% title %]

+ +

[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]

+ +
+ + +
+ + diff --git a/templates/webpages/admin/backup_dataset_email_done_master.html b/templates/webpages/admin/backup_dataset_email_done_master.html deleted file mode 100644 index 68f31d771..000000000 --- a/templates/webpages/admin/backup_dataset_email_done_master.html +++ /dev/null @@ -1,14 +0,0 @@ -[%- USE T8 %] -[%- USE LxERP %] -[% USE HTML %] - -

[% title %]

- -

[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]

- -
- - -
- - diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html deleted file mode 100644 index 073774187..000000000 --- a/templates/webpages/admin/backup_dataset_master.html +++ /dev/null @@ -1,97 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - - - -

[% title %]

- - [% IF NO_DATABSES %] - [% 'No databases have been found on this server.' | $T8 %] - - [% ELSE %] - -
- - - - - - - -

- [% 'Please select the database you want to backup' | $T8 %]: - -

- - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% 'From' | $T8 %]
[% 'To' | $T8 %]
[% 'Cc' | $T8 %]
[% 'Subject' | $T8 %]
[% 'Message' | $T8 %]
- -
- - - - - -
- -
- - - - -
- - [% END %] - - - diff --git a/templates/webpages/admin/check_auth_database.html b/templates/webpages/admin/check_auth_database.html new file mode 100644 index 000000000..4c554130e --- /dev/null +++ b/templates/webpages/admin/check_auth_database.html @@ -0,0 +1,62 @@ +[%- USE T8 %] +[% USE HTML %] + +
[% title %]
+ +
+ +

+ [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %] +

+ + + + + + + + + + + + + + + + + + +
[% 'Host' | $T8 %]:[% HTML.escape(db_host) %]
[% 'Port' | $T8 %]:[% HTML.escape(db_port) %]
[% 'User name' | $T8 %]:[% HTML.escape(db_user) %]
[% 'Database name' | $T8 %]:[% HTML.escape(db_db) %]
+ +

+ [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %] +

+ +

[% 'Template database' | $T8 %]:

+ +

+ [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %] +

+ + + + + + + + + + +
[% 'Superuser name' | $T8 %]:
[% 'Password' | $T8 %]:
+ + + + + + + +
+ + + diff --git a/templates/webpages/admin/check_auth_database_master.html b/templates/webpages/admin/check_auth_database_master.html deleted file mode 100644 index 4c554130e..000000000 --- a/templates/webpages/admin/check_auth_database_master.html +++ /dev/null @@ -1,62 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -
[% title %]
- -
- -

- [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %] -

- - - - - - - - - - - - - - - - - - -
[% 'Host' | $T8 %]:[% HTML.escape(db_host) %]
[% 'Port' | $T8 %]:[% HTML.escape(db_port) %]
[% 'User name' | $T8 %]:[% HTML.escape(db_user) %]
[% 'Database name' | $T8 %]:[% HTML.escape(db_db) %]
- -

- [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %] -

- -

[% 'Template database' | $T8 %]:

- -

- [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %] -

- - - - - - - - - - -
[% 'Superuser name' | $T8 %]:
[% 'Password' | $T8 %]:
- - - - - - - -
- - - diff --git a/templates/webpages/admin/check_auth_tables.html b/templates/webpages/admin/check_auth_tables.html new file mode 100644 index 000000000..64ef01b29 --- /dev/null +++ b/templates/webpages/admin/check_auth_tables.html @@ -0,0 +1,44 @@ +[%- USE T8 %] +[% USE HTML %] + +
[% title %]
+ +

+ [% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %] +

+ + + + + + + + + + + + + + + + + + +
[% 'Host' | $T8 %]:[% HTML.escape(db_host) %]
[% 'Port' | $T8 %]:[% HTML.escape(db_port) %]
[% 'User name' | $T8 %]:[% HTML.escape(db_user) %]
[% 'Database name' | $T8 %]:[% HTML.escape(db_db) %]
+ +

+ [% 'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' | $T8 %] +

+ +
+ + + + + + + +
+ + + diff --git a/templates/webpages/admin/check_auth_tables_master.html b/templates/webpages/admin/check_auth_tables_master.html deleted file mode 100644 index 64ef01b29..000000000 --- a/templates/webpages/admin/check_auth_tables_master.html +++ /dev/null @@ -1,44 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -
[% title %]
- -

- [% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %] -

- - - - - - - - - - - - - - - - - - -
[% 'Host' | $T8 %]:[% HTML.escape(db_host) %]
[% 'Port' | $T8 %]:[% HTML.escape(db_port) %]
[% 'User name' | $T8 %]:[% HTML.escape(db_user) %]
[% 'Database name' | $T8 %]:[% HTML.escape(db_db) %]
- -

- [% 'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' | $T8 %] -

- -
- - - - - - - -
- - - diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html new file mode 100644 index 000000000..db60b3b05 --- /dev/null +++ b/templates/webpages/admin/create_dataset.html @@ -0,0 +1,67 @@ +[%- USE T8 %] +[% USE HTML %] + +

[% title %]

+ +
+ +

+ [% 'You can either create a new database or chose an existing database.' | $T8 %] + [% 'In the latter case the tables needed by Lx-Office will be created in that database.' | $T8 %] +

+ + + + + + + + + + + + + + + + + + + + + + +
[% 'Existing Datasets' | $T8 %][% HTML.escape(dbsources) %]
[% 'Create Dataset' | $T8 %]
[% 'Multibyte Encoding' | $T8 %] + [%- IF FORCE_DBENCODING %] + + [% HTML.escape(FORCE_DBENCODING) %] + [%- ELSE %] + + [%- END %] +
[% 'Create Chart of Accounts' | $T8 %] + +
+ + + + + + + + + + + + +
+ +

+ +
+ + + diff --git a/templates/webpages/admin/create_dataset_master.html b/templates/webpages/admin/create_dataset_master.html deleted file mode 100644 index db60b3b05..000000000 --- a/templates/webpages/admin/create_dataset_master.html +++ /dev/null @@ -1,67 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -

[% title %]

- -
- -

- [% 'You can either create a new database or chose an existing database.' | $T8 %] - [% 'In the latter case the tables needed by Lx-Office will be created in that database.' | $T8 %] -

- - - - - - - - - - - - - - - - - - - - - - -
[% 'Existing Datasets' | $T8 %][% HTML.escape(dbsources) %]
[% 'Create Dataset' | $T8 %]
[% 'Multibyte Encoding' | $T8 %] - [%- IF FORCE_DBENCODING %] - - [% HTML.escape(FORCE_DBENCODING) %] - [%- ELSE %] - - [%- END %] -
[% 'Create Chart of Accounts' | $T8 %] - -
- - - - - - - - - - - - -
- -

- -
- - - diff --git a/templates/webpages/admin/create_standard_group_ask.html b/templates/webpages/admin/create_standard_group_ask.html new file mode 100644 index 000000000..d5f680f6e --- /dev/null +++ b/templates/webpages/admin/create_standard_group_ask.html @@ -0,0 +1,50 @@ +[%- USE T8 %] +[% USE HTML %] + +
[% title %]
+ +
+ +

+ + [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %] + + [%- 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' | $T8 %] + + [% 'Otherwise all users will only have access to their own settings.' | $T8 %] + +

+ +

+ + [%- 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office\'s functions.' | $T8 %] + + [%- 'This corresponds to Lx-Office\'s behavior prior to version 2.4.4.' | $T8 %] + +

+ +

+ + [% 'Alternatively you can skip this step and create groups yourself.' | $T8 %] + +

+ +

+ + [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %] + + [% 'This group will be called "Full Access".' | $T8 %] + +

+ + + +

+ + +

+ +
+ + + diff --git a/templates/webpages/admin/create_standard_group_ask_master.html b/templates/webpages/admin/create_standard_group_ask_master.html deleted file mode 100644 index d5f680f6e..000000000 --- a/templates/webpages/admin/create_standard_group_ask_master.html +++ /dev/null @@ -1,50 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -
[% title %]
- -
- -

- - [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %] - - [%- 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' | $T8 %] - - [% 'Otherwise all users will only have access to their own settings.' | $T8 %] - -

- -

- - [%- 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office\'s functions.' | $T8 %] - - [%- 'This corresponds to Lx-Office\'s behavior prior to version 2.4.4.' | $T8 %] - -

- -

- - [% 'Alternatively you can skip this step and create groups yourself.' | $T8 %] - -

- -

- - [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %] - - [% 'This group will be called "Full Access".' | $T8 %] - -

- - - -

- - -

- -
- - - diff --git a/templates/webpages/admin/dbadmin.html b/templates/webpages/admin/dbadmin.html new file mode 100644 index 000000000..7533dcd56 --- /dev/null +++ b/templates/webpages/admin/dbadmin.html @@ -0,0 +1,72 @@ +[%- USE T8 %] +[% USE HTML %] + +

[% title %]

+ +
+ + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Host' | $T8 %][% 'Port' | $T8 %]
[% 'User' | $T8 %][% 'Password' | $T8 %]
[% 'Database template' | $T8 %]
+ +
+ + + +
+ + + + + [% IF ALLOW_DBBACKUP %] + + + [% END %] +
+
+ +

[% 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' | $T8 %]

+ +

[% 'Leave host and port field empty unless you want to make a remote connection.' | $T8 %]

+ + + diff --git a/templates/webpages/admin/dbadmin_master.html b/templates/webpages/admin/dbadmin_master.html deleted file mode 100644 index 7533dcd56..000000000 --- a/templates/webpages/admin/dbadmin_master.html +++ /dev/null @@ -1,72 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -

[% title %]

- -
- - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% 'Host' | $T8 %][% 'Port' | $T8 %]
[% 'User' | $T8 %][% 'Password' | $T8 %]
[% 'Database template' | $T8 %]
- -
- - - -
- - - - - [% IF ALLOW_DBBACKUP %] - - - [% END %] -
-
- -

[% 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' | $T8 %]

- -

[% 'Leave host and port field empty unless you want to make a remote connection.' | $T8 %]

- - - diff --git a/templates/webpages/admin/dbcreate.html b/templates/webpages/admin/dbcreate.html new file mode 100644 index 000000000..31fffca0e --- /dev/null +++ b/templates/webpages/admin/dbcreate.html @@ -0,0 +1,19 @@ +[%- USE T8 %] +[%- USE HTML %] +[%- USE LxERP %] + + +

[% title %]

+ +
+ +

[% LxERP.t8('The dataset #1 has been successfully created.', db) | html %]

+ + + +

+ +
+ + + diff --git a/templates/webpages/admin/dbcreate_master.html b/templates/webpages/admin/dbcreate_master.html deleted file mode 100644 index 31fffca0e..000000000 --- a/templates/webpages/admin/dbcreate_master.html +++ /dev/null @@ -1,19 +0,0 @@ -[%- USE T8 %] -[%- USE HTML %] -[%- USE LxERP %] - - -

[% title %]

- -
- -

[% LxERP.t8('The dataset #1 has been successfully created.', db) | html %]

- - - -

- -
- - - diff --git a/templates/webpages/admin/dbdelete.html b/templates/webpages/admin/dbdelete.html new file mode 100644 index 000000000..c3537da4e --- /dev/null +++ b/templates/webpages/admin/dbdelete.html @@ -0,0 +1,17 @@ +[%- USE T8 %] +[%- USE LxERP %] +[% USE HTML %] + +

[% title %]

+ +
+ +

[% LxERP.t8('The database #1 has been successfully deleted.', db) | html %]

+ + + +

+
+ + + diff --git a/templates/webpages/admin/dbdelete_master.html b/templates/webpages/admin/dbdelete_master.html deleted file mode 100644 index c3537da4e..000000000 --- a/templates/webpages/admin/dbdelete_master.html +++ /dev/null @@ -1,17 +0,0 @@ -[%- USE T8 %] -[%- USE LxERP %] -[% USE HTML %] - -

[% title %]

- -
- -

[% LxERP.t8('The database #1 has been successfully deleted.', db) | html %]

- - - -

-
- - - diff --git a/templates/webpages/admin/dbupgrade_all_done.html b/templates/webpages/admin/dbupgrade_all_done.html new file mode 100644 index 000000000..b55a3d57b --- /dev/null +++ b/templates/webpages/admin/dbupgrade_all_done.html @@ -0,0 +1,20 @@ +[%- USE T8 %] +[% USE HTML%] +[% IF NOTHING_TO_DO %] +

[% 'No datasets have been selected.' | $T8 %]

+ + [% ELSE %] + +
+ +

[% 'All database upgrades have been applied.' | $T8 %]

+[% END %] + +
+ + + +
+ + + diff --git a/templates/webpages/admin/dbupgrade_all_done_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html deleted file mode 100644 index b55a3d57b..000000000 --- a/templates/webpages/admin/dbupgrade_all_done_master.html +++ /dev/null @@ -1,20 +0,0 @@ -[%- USE T8 %] -[% USE HTML%] -[% IF NOTHING_TO_DO %] -

[% 'No datasets have been selected.' | $T8 %]

- - [% ELSE %] - -
- -

[% 'All database upgrades have been applied.' | $T8 %]

-[% END %] - -
- - - -
- - - diff --git a/templates/webpages/admin/dbupgrade_all_header.html b/templates/webpages/admin/dbupgrade_all_header.html new file mode 100644 index 000000000..68c7ecaee --- /dev/null +++ b/templates/webpages/admin/dbupgrade_all_header.html @@ -0,0 +1,2 @@ + + diff --git a/templates/webpages/admin/dbupgrade_all_header_master.html b/templates/webpages/admin/dbupgrade_all_header_master.html deleted file mode 100644 index 68c7ecaee..000000000 --- a/templates/webpages/admin/dbupgrade_all_header_master.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/templates/webpages/admin/dbupgrade_footer.html b/templates/webpages/admin/dbupgrade_footer.html new file mode 100644 index 000000000..28e285684 --- /dev/null +++ b/templates/webpages/admin/dbupgrade_footer.html @@ -0,0 +1,2 @@ +[%- USE T8 %] +

[% '...done' | $T8 %]

diff --git a/templates/webpages/admin/dbupgrade_footer_master.html b/templates/webpages/admin/dbupgrade_footer_master.html deleted file mode 100644 index 28e285684..000000000 --- a/templates/webpages/admin/dbupgrade_footer_master.html +++ /dev/null @@ -1,2 +0,0 @@ -[%- USE T8 %] -

[% '...done' | $T8 %]

diff --git a/templates/webpages/admin/dbupgrade_header.html b/templates/webpages/admin/dbupgrade_header.html new file mode 100644 index 000000000..cc3704916 --- /dev/null +++ b/templates/webpages/admin/dbupgrade_header.html @@ -0,0 +1,2 @@ +[%- USE T8 %] +[% USE HTML %]
[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/admin/dbupgrade_header_master.html b/templates/webpages/admin/dbupgrade_header_master.html deleted file mode 100644 index cc3704916..000000000 --- a/templates/webpages/admin/dbupgrade_header_master.html +++ /dev/null @@ -1,2 +0,0 @@ -[%- USE T8 %] -[% USE HTML %]
[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/admin/delete_dataset.html b/templates/webpages/admin/delete_dataset.html new file mode 100644 index 000000000..2062aed2f --- /dev/null +++ b/templates/webpages/admin/delete_dataset.html @@ -0,0 +1,32 @@ +[%- USE T8 %] +[% USE HTML %] + +

[% title %]

+ +
+ +

[% 'You can only delete datasets that are not in use.' | $T8 %] + [% 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' | $T8 %]

+ +

[% 'Please seletct the dataset you want to delete:' | $T8 %] + +

+ + + + + + + + + + + + + +

+ +
+ + + diff --git a/templates/webpages/admin/delete_dataset_master.html b/templates/webpages/admin/delete_dataset_master.html deleted file mode 100644 index 2062aed2f..000000000 --- a/templates/webpages/admin/delete_dataset_master.html +++ /dev/null @@ -1,32 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -

[% title %]

- -
- -

[% 'You can only delete datasets that are not in use.' | $T8 %] - [% 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' | $T8 %]

- -

[% 'Please seletct the dataset you want to delete:' | $T8 %] - -

- - - - - - - - - - - - - -

- -
- - - diff --git a/templates/webpages/admin/delete_group_confirm.html b/templates/webpages/admin/delete_group_confirm.html new file mode 100644 index 000000000..2f684a5c8 --- /dev/null +++ b/templates/webpages/admin/delete_group_confirm.html @@ -0,0 +1,20 @@ +[%- USE T8 %] +[% USE HTML %] +
+ + + + + +
[% 'Delete group' | $T8 %]
+ +

[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?

+ + + + + +
+ + + diff --git a/templates/webpages/admin/delete_group_confirm_master.html b/templates/webpages/admin/delete_group_confirm_master.html deleted file mode 100644 index 2f684a5c8..000000000 --- a/templates/webpages/admin/delete_group_confirm_master.html +++ /dev/null @@ -1,20 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] -
- - - - - -
[% 'Delete group' | $T8 %]
- -

[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?

- - - - - -
- - - diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html new file mode 100644 index 000000000..177fbc9be --- /dev/null +++ b/templates/webpages/admin/edit_group.html @@ -0,0 +1,115 @@ +[%- USE T8 %] +[% USE HTML %] +
+ + + + + + [% IF message %] +

[% message %]

+ [% END %] + +
[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
[% 'Users in
this group' | $T8 %]		 [% 'Users not in this group' | $T8 %]
+ + + +
+
+ + 		+ +
+ +
+ +
+ + + + + + + [% FOREACH right = RIGHTS %] + + + + [% END %] + + + + +
[% 'Edit rights' | $T8 %]
+ [% IF right.is_section %] + [% right.description %] + [% ELSE %] + + + [% END %] +
+ + +   + +
+ +
+ + + + + + + + + + + + + + + + + + + +
[% 'Rename the group' | $T8 %]
[% 'Name' | $T8 %]:
[% 'Description' | $T8 %]:
+ + +   + +
+
+
+ + + diff --git a/templates/webpages/admin/edit_group_master.html b/templates/webpages/admin/edit_group_master.html deleted file mode 100644 index 177fbc9be..000000000 --- a/templates/webpages/admin/edit_group_master.html +++ /dev/null @@ -1,115 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] -
- - - - - - [% IF message %] -

[% message %]

- [% END %] - -
[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]
- - - - - -
- - - - - - - - - - - - - - - - - - -
[% 'Users in
this group' | $T8 %]		 [% 'Users not in this group' | $T8 %]
- - - -
-
- - 		- -
- -
- -
- - - - - - - [% FOREACH right = RIGHTS %] - - - - [% END %] - - - - -
[% 'Edit rights' | $T8 %]
- [% IF right.is_section %] - [% right.description %] - [% ELSE %] - - - [% END %] -
- - -   - -
- -
- - - - - - - - - - - - - - - - - - - -
[% 'Rename the group' | $T8 %]
[% 'Name' | $T8 %]:
[% 'Description' | $T8 %]:
- - -   - -
-
-
- - - diff --git a/templates/webpages/admin/edit_group_membership.html b/templates/webpages/admin/edit_group_membership.html new file mode 100644 index 000000000..3792aa42a --- /dev/null +++ b/templates/webpages/admin/edit_group_membership.html @@ -0,0 +1,47 @@ +[%- USE T8 %] +[% USE HTML %][% USE LxERP %] + +
[% 'Edit group membership' | $T8 %]
+ +

[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]

+ +
+ +

+ + [% FOREACH user = USERS %] + + [% IF user.repeat_headings %] + + + + [% FOREACH column = HEADINGS %] + [% END %] + + [% END %] + + + + + [% FOREACH group = user.GROUPS %] + + [% END %] + + [% END %] +
[% 'Login' | $T8 %][% 'Name' | $T8 %][% LxERP.turn90(column.title) %]
[% HTML.escape(user.login) %][% HTML.escape(user.name) %] + +
+

+ + + + +

+ + +

+ +
+ + + diff --git a/templates/webpages/admin/edit_group_membership_master.html b/templates/webpages/admin/edit_group_membership_master.html deleted file mode 100644 index 3792aa42a..000000000 --- a/templates/webpages/admin/edit_group_membership_master.html +++ /dev/null @@ -1,47 +0,0 @@ -[%- USE T8 %] -[% USE HTML %][% USE LxERP %] - -
[% 'Edit group membership' | $T8 %]
- -

[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]

- -
- -

- - [% FOREACH user = USERS %] - - [% IF user.repeat_headings %] - - - - [% FOREACH column = HEADINGS %] - [% END %] - - [% END %] - - - - - [% FOREACH group = user.GROUPS %] - - [% END %] - - [% END %] -
[% 'Login' | $T8 %][% 'Name' | $T8 %][% LxERP.turn90(column.title) %]
[% HTML.escape(user.login) %][% HTML.escape(user.name) %] - -
-

- - - - -

- - -

- -
- - - diff --git a/templates/webpages/admin/edit_groups.html b/templates/webpages/admin/edit_groups.html new file mode 100644 index 000000000..fcf034a2b --- /dev/null +++ b/templates/webpages/admin/edit_groups.html @@ -0,0 +1,81 @@ +[%- USE T8 %] +[% USE HTML %] +
+ + + [% IF message %] +

[% message %]

+ [% END %] + +
[% 'Edit groups' | $T8 %]
+ +
+ +
[% 'Edit and delete a group' | $T8 %]
+ + [% IF num_groups %] +

+ +

+ [% ELSE %] +

[% 'No groups have been added yet.' | $T8 %]

+ [% END %] + +

+ [% IF num_groups %] + + + + + [% END %] + + +

+
+ +
+ +
[% 'Group membership' | $T8 %]
+ +

[% 'Edit the membership of all users in all groups:' | $T8 %]

+ +
+

+ + +

+ +
+ +
+ +
[% 'Add a new group' | $T8 %]
+ +
+

+ + + + + + + + + + +
[% 'Name' | $T8 %]:
[% 'Description' | $T8 %]:
+

+ +

+ + +

+ +
+ + + diff --git a/templates/webpages/admin/edit_groups_master.html b/templates/webpages/admin/edit_groups_master.html deleted file mode 100644 index fcf034a2b..000000000 --- a/templates/webpages/admin/edit_groups_master.html +++ /dev/null @@ -1,81 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] -
- - - [% IF message %] -

[% message %]

- [% END %] - -
[% 'Edit groups' | $T8 %]
- -
- -
[% 'Edit and delete a group' | $T8 %]
- - [% IF num_groups %] -

- -

- [% ELSE %] -

[% 'No groups have been added yet.' | $T8 %]

- [% END %] - -

- [% IF num_groups %] - - - - - [% END %] - - -

-
- -
- -
[% 'Group membership' | $T8 %]
- -

[% 'Edit the membership of all users in all groups:' | $T8 %]

- -
-

- - -

- -
- -
- -
[% 'Add a new group' | $T8 %]
- -
-

- - - - - - - - - - -
[% 'Name' | $T8 %]:
[% 'Description' | $T8 %]:
-

- -

- - -

- -
- - - diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html new file mode 100644 index 000000000..81eb1ea5e --- /dev/null +++ b/templates/webpages/admin/edit_user.html @@ -0,0 +1,282 @@ +[%- USE T8 %] +[% USE HTML %] + + + + + +
+ +
[% title %]
+ + + + + + + + + + + + + + + + + [% IF edit %] + + + + + + + + + + + + + + [% END %] + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Login' | $T8 %] + [%- IF edit %] + [% HTML.escape(myc_login) %] + [%- ELSE %] + + [%- END %] +
[% 'Password' | $T8 %][% IF CAN_CHANGE_PASSWORD %][% ELSE %]********[% END %]
[% 'Name' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Signature' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Company' | $T8 %]
[% 'Address' | $T8 %]
[% 'Tax number' | $T8 %]
[% 'Ust-IDNr' | $T8 %]
[% 'DUNS-Nr' | $T8 %]
+ 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Date Format' | $T8 %] + +
[% 'Number Format' | $T8 %] + +
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %] + +
[% 'Stylesheet' | $T8 %] + +
[% 'Printer' | $T8 %]
[% 'Use Templates' | $T8 %] + +
[% 'New Templates' | $T8 %]
[% 'Setup Templates' | $T8 %] + +
[% 'Setup Menu' | $T8 %] + +
+
[% 'Database' | $T8 %]
+ + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Driver' | $T8 %]PostgreSQL[% 'Host' | $T8 %]
[% 'Dataset' | $T8 %][% 'Port' | $T8 %]
[% 'User' | $T8 %][% 'Password' | $T8 %]
+
[% 'Group membership' | $T8 %]
[% 'The user is a member in the following group(s):' | $T8 %]
[% FOREACH row = GROUPS %][% HTML.escape(row.name) %] + [% UNLESS loop.last %] | [% END %][% END %]
+ + + + + + + [% IF edit %] + [% FOREACH row = GROUPS %] + + [% END %] + + + + + + [% END %] + +
+ + + + + diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html deleted file mode 100644 index 81eb1ea5e..000000000 --- a/templates/webpages/admin/edit_user_master.html +++ /dev/null @@ -1,282 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - - - - - -
- -
[% title %]
- - - - - - - - - - - - - - - - - [% IF edit %] - - - - - - - - - - - - - - [% END %] - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% 'Login' | $T8 %] - [%- IF edit %] - [% HTML.escape(myc_login) %] - [%- ELSE %] - - [%- END %] -
[% 'Password' | $T8 %][% IF CAN_CHANGE_PASSWORD %][% ELSE %]********[% END %]
[% 'Name' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Signature' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Company' | $T8 %]
[% 'Address' | $T8 %]
[% 'Tax number' | $T8 %]
[% 'Ust-IDNr' | $T8 %]
[% 'DUNS-Nr' | $T8 %]
- 		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% 'Date Format' | $T8 %] - -
[% 'Number Format' | $T8 %] - -
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %] - -
[% 'Stylesheet' | $T8 %] - -
[% 'Printer' | $T8 %]
[% 'Use Templates' | $T8 %] - -
[% 'New Templates' | $T8 %]
[% 'Setup Templates' | $T8 %] - -
[% 'Setup Menu' | $T8 %] - -
-
[% 'Database' | $T8 %]
- - - - - - - - - - - - - - - - - - - - - - - - - -
[% 'Driver' | $T8 %]PostgreSQL[% 'Host' | $T8 %]
[% 'Dataset' | $T8 %][% 'Port' | $T8 %]
[% 'User' | $T8 %][% 'Password' | $T8 %]
-
[% 'Group membership' | $T8 %]
[% 'The user is a member in the following group(s):' | $T8 %]
[% FOREACH row = GROUPS %][% HTML.escape(row.name) %] - [% UNLESS loop.last %] | [% END %][% END %]
- - - - - - - [% IF edit %] - [% FOREACH row = GROUPS %] - - [% END %] - - - - - - [% END %] - -
- - - - - diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html new file mode 100644 index 000000000..6d7309f42 --- /dev/null +++ b/templates/webpages/admin/list_users.html @@ -0,0 +1,74 @@ +[%- USE T8 %] +[% USE HTML %] + +
+ +
[% title %]
+ +

+ + + + + + + + + + + + [% FOREACH row = MEMBERS %] + + + + + + + + + + [% END %] + + +
[% 'Login' | $T8 %][% 'Name' | $T8 %][% 'Company' | $T8 %][% 'Driver' | $T8 %][% 'Host' | $T8 %][% 'Dataset' | $T8 %][% 'Templates' | $T8 %]
[% HTML.escape(row.login) %][% HTML.escape(row.name) %][% HTML.escape(row.company) %][% HTML.escape(row.dbdriver) %][% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %][% HTML.escape(row.dbname) %][% HTML.escape(row.templates) %]
+

+ + + + + + [% IF LOCKED %] + + [% ELSE %] + + [% END %] + + +

[% 'Click on login name to edit!' | $T8 %]

+ +

[% 'To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.' | $T8 %]

+
+ +
+ +
Lx-Office ERP [% 'Login' | $T8 %]
+ + + + + + + + + + + + +
[% 'Name' | $T8 %] 
[% 'Password' | $T8 %]
+ +
+ +
+ + + diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html deleted file mode 100644 index 6d7309f42..000000000 --- a/templates/webpages/admin/list_users_master.html +++ /dev/null @@ -1,74 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -
- -
[% title %]
- -

- - - - - - - - - - - - [% FOREACH row = MEMBERS %] - - - - - - - - - - [% END %] - - -
[% 'Login' | $T8 %][% 'Name' | $T8 %][% 'Company' | $T8 %][% 'Driver' | $T8 %][% 'Host' | $T8 %][% 'Dataset' | $T8 %][% 'Templates' | $T8 %]
[% HTML.escape(row.login) %][% HTML.escape(row.name) %][% HTML.escape(row.company) %][% HTML.escape(row.dbdriver) %][% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %][% HTML.escape(row.dbname) %][% HTML.escape(row.templates) %]
-

- - - - - - [% IF LOCKED %] - - [% ELSE %] - - [% END %] - - -

[% 'Click on login name to edit!' | $T8 %]

- -

[% 'To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.' | $T8 %]

-
- -
- -
Lx-Office ERP [% 'Login' | $T8 %]
- - - - - - - - - - - - -
[% 'Name' | $T8 %] 
[% 'Password' | $T8 %]
- -
- -
- - - diff --git a/templates/webpages/admin/restore_dataset.html b/templates/webpages/admin/restore_dataset.html new file mode 100644 index 000000000..ab7a94bca --- /dev/null +++ b/templates/webpages/admin/restore_dataset.html @@ -0,0 +1,58 @@ +[%- USE T8 %] +[% USE HTML %] + +

[% title %]

+ +
+ + + + + + + +

+ [% 'Please enter the name of the dataset you want to restore the backup in.' | $T8 %] + [% 'The dataset has to exist before a restoration can be started.' | $T8 %] + [% 'You can create a missing dataset by going back and chosing "Create Dataset".' | $T8 %] +

+ +

+ [%- 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' | $T8 %] + [%- 'It may optionally be compressed with "gzip".' | $T8 %] + [%- 'Files created by Lx-Office\'s "Backup Dataset" function are such files.' | $T8 %] +

+ + + + + + + + + + + + + + + + +
[% 'Dataset name' | $T8 %]
[% 'Multibyte Encoding' | $T8 %] + +
[% 'Backup file' | $T8 %]
+ + + +
+ +
+ + + +
+ + + diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html deleted file mode 100644 index ab7a94bca..000000000 --- a/templates/webpages/admin/restore_dataset_master.html +++ /dev/null @@ -1,58 +0,0 @@ -[%- USE T8 %] -[% USE HTML %] - -

[% title %]

- -
- - - - - - - -

- [% 'Please enter the name of the dataset you want to restore the backup in.' | $T8 %] - [% 'The dataset has to exist before a restoration can be started.' | $T8 %] - [% 'You can create a missing dataset by going back and chosing "Create Dataset".' | $T8 %] -

- -

- [%- 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' | $T8 %] - [%- 'It may optionally be compressed with "gzip".' | $T8 %] - [%- 'Files created by Lx-Office\'s "Backup Dataset" function are such files.' | $T8 %] -

- - - - - - - - - - - - - - - - -
[% 'Dataset name' | $T8 %]
[% 'Multibyte Encoding' | $T8 %] - -
[% 'Backup file' | $T8 %]
- - - -
- -
- - - -
- - - diff --git a/templates/webpages/admin/restore_dataset_start_footer.html b/templates/webpages/admin/restore_dataset_start_footer.html new file mode 100644 index 000000000..c61a55e53 --- /dev/null +++ b/templates/webpages/admin/restore_dataset_start_footer.html @@ -0,0 +1,17 @@ +[%- USE T8 %] +[%- USE LxERP %] +[% USE HTML %] + +
+ +

+ [%- 'The restoration process is complete. Please review "pg_restore"\'s output to find out if the restoration was successful.' | $T8 %] + [%- 'The program\'s exit code was [% HTML.escape(retval) %] ("0" usually means that everything went OK).' | $T8 %] +

+ +
+ + +
+ + diff --git a/templates/webpages/admin/restore_dataset_start_footer_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html deleted file mode 100644 index c61a55e53..000000000 --- a/templates/webpages/admin/restore_dataset_start_footer_master.html +++ /dev/null @@ -1,17 +0,0 @@ -[%- USE T8 %] -[%- USE LxERP %] -[% USE HTML %] - -
- -

- [%- 'The restoration process is complete. Please review "pg_restore"\'s output to find out if the restoration was successful.' | $T8 %] - [%- 'The program\'s exit code was [% HTML.escape(retval) %] ("0" usually means that everything went OK).' | $T8 %] -

- -
- - -
- - diff --git a/templates/webpages/admin/restore_dataset_start_header.html b/templates/webpages/admin/restore_dataset_start_header.html new file mode 100644 index 000000000..ede5e7ccd --- /dev/null +++ b/templates/webpages/admin/restore_dataset_start_header.html @@ -0,0 +1,10 @@ +[%- USE T8 %] + + +

[% title %]

+ +

[%- 'The restoration process has started. Here\'s the output of the "pg_restore" command:' | $T8 %]

+ +
+ + 
diff --git a/templates/webpages/admin/restore_dataset_start_header_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html
deleted file mode 100644
index ede5e7ccd..000000000
--- a/templates/webpages/admin/restore_dataset_start_header_master.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- USE T8 %]
-
-
- 
[% title %]

-
- 
[%- 'The restoration process has started. Here\'s the output of the "pg_restore" command:' | $T8 %]

-
- 

-
- 
diff --git a/templates/webpages/admin/test_db_connection.html b/templates/webpages/admin/test_db_connection.html
new file mode 100644
index 000000000..865efeac9
--- /dev/null
+++ b/templates/webpages/admin/test_db_connection.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ [%- IF connection_ok %]
+
+ 
[% 'The connection was established successfully.' | $T8 %]

+
+ [%- ELSE %]
+
+ 

+  [% 'The connection to the database could not be established.' | $T8 %]
+  [% 'Error message from the database driver:' | $T8 %]
+ 

+
+ 
[% HTML.escape(errstr) %]

+
+ [%- END %]
+
+ 

+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/admin/test_db_connection_master.html b/templates/webpages/admin/test_db_connection_master.html
deleted file mode 100644
index 865efeac9..000000000
--- a/templates/webpages/admin/test_db_connection_master.html
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- [%- IF connection_ok %]
-
- 
[% 'The connection was established successfully.' | $T8 %]

-
- [%- ELSE %]
-
- 

-  [% 'The connection to the database could not be established.' | $T8 %]
-  [% 'Error message from the database driver:' | $T8 %]
- 

-
- 
[% HTML.escape(errstr) %]

-
- [%- END %]
-
- 

-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/admin/update_dataset.html b/templates/webpages/admin/update_dataset.html
new file mode 100644
index 000000000..8d3208642
--- /dev/null
+++ b/templates/webpages/admin/update_dataset.html
@@ -0,0 +1,57 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ [% IF ALL_UPDATED %]
+  [% 'All Datasets up to date!' | $T8 %]
+
+  [% ELSE %]
+
+  

+
+   
[% 'The following Datasets need to be updated' | $T8 %]:

+
+   
+    
+     
+     
+     
+     
+     
+     
+    
+
+    [% FOREACH row = NEED_UPDATES %]
+     
+      
+      
+      
+      
+      
+      
+     
+
+    [% END %]
+   
[% 'Update?' | $T8 %][% 'Dataset' | $T8 %][% 'Driver' | $T8 %][% 'Host' | $T8 %][% 'Port' | $T8 %][% 'User' | $T8 %]

+       
+       
+      PostgreSQL[% HTML.escape(row.dbhost) %][% HTML.escape(row.dbport) %][% HTML.escape(row.dbuser) %]

+
+   
+
+   
+   
+
+   

+
+   

+
+   
+
+  

+
+ [% END %]
+
+
+
diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html
deleted file mode 100644
index 8d3208642..000000000
--- a/templates/webpages/admin/update_dataset_master.html
+++ /dev/null
@@ -1,57 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- [% IF ALL_UPDATED %]
-  [% 'All Datasets up to date!' | $T8 %]
-
-  [% ELSE %]
-
-  

-
-   
[% 'The following Datasets need to be updated' | $T8 %]:

-
-   
-    
-     
-     
-     
-     
-     
-     
-    
-
-    [% FOREACH row = NEED_UPDATES %]
-     
-      
-      
-      
-      
-      
-      
-     
-
-    [% END %]
-   
[% 'Update?' | $T8 %][% 'Dataset' | $T8 %][% 'Driver' | $T8 %][% 'Host' | $T8 %][% 'Port' | $T8 %][% 'User' | $T8 %]

-       
-       
-      PostgreSQL[% HTML.escape(row.dbhost) %][% HTML.escape(row.dbport) %][% HTML.escape(row.dbuser) %]

-
-   
-
-   
-   
-
-   

-
-   

-
-   
-
-  

-
- [% END %]
-
-
-
diff --git a/templates/webpages/admin/user_migration.html b/templates/webpages/admin/user_migration.html
new file mode 100644
index 000000000..ef34e55e7
--- /dev/null
+++ b/templates/webpages/admin/user_migration.html
@@ -0,0 +1,26 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 

+
+  

+   [% LxERP.t8('The old file containing the user information is still present ("#1"). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file.', memberfile) | html %]
+  

+
+  

+   [% LxERP.t8('If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".', backupdir) | html %]
+  

+
+  
+  
+
+  
+  
+
+ 

+
+
+
diff --git a/templates/webpages/admin/user_migration_complete.html b/templates/webpages/admin/user_migration_complete.html
new file mode 100644
index 000000000..5f5114caa
--- /dev/null
+++ b/templates/webpages/admin/user_migration_complete.html
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 

+
+  [%- IF standard_group_created %]
+  
[% 'A group named "Full Access" has been created.' | $T8 %]

+  [%- END %]
+
+
+  
[% 'The user migration process is complete.' | $T8 %]
+   [% 'You will now be forwarded to the administration panel.' | $T8 %]

+
+  
+
+  

+   
+  

+
+ 

+
+
+
diff --git a/templates/webpages/admin/user_migration_complete_master.html b/templates/webpages/admin/user_migration_complete_master.html
deleted file mode 100644
index 5f5114caa..000000000
--- a/templates/webpages/admin/user_migration_complete_master.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 

-
-  [%- IF standard_group_created %]
-  
[% 'A group named "Full Access" has been created.' | $T8 %]

-  [%- END %]
-
-
-  
[% 'The user migration process is complete.' | $T8 %]
-   [% 'You will now be forwarded to the administration panel.' | $T8 %]

-
-  
-
-  

-   
-  

-
- 

-
-
-
diff --git a/templates/webpages/admin/user_migration_done.html b/templates/webpages/admin/user_migration_done.html
new file mode 100644
index 000000000..c20263c39
--- /dev/null
+++ b/templates/webpages/admin/user_migration_done.html
@@ -0,0 +1,19 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 

+
+  
[% 'The following users have been migrated into the authentication database:' | $T8 %]

+
+  
[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]

+
+  
+
+  
+
+ 

+
+
+
diff --git a/templates/webpages/admin/user_migration_done_master.html b/templates/webpages/admin/user_migration_done_master.html
deleted file mode 100644
index c20263c39..000000000
--- a/templates/webpages/admin/user_migration_done_master.html
+++ /dev/null
@@ -1,19 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 

-
-  
[% 'The following users have been migrated into the authentication database:' | $T8 %]

-
-  
[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]

-
-  
-
-  
-
- 

-
-
-
diff --git a/templates/webpages/admin/user_migration_master.html b/templates/webpages/admin/user_migration_master.html
deleted file mode 100644
index ef34e55e7..000000000
--- a/templates/webpages/admin/user_migration_master.html
+++ /dev/null
@@ -1,26 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-[% USE HTML %]
-
- 
[% title %]

-
- 

-
-  

-   [% LxERP.t8('The old file containing the user information is still present ("#1"). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file.', memberfile) | html %]
-  

-
-  

-   [% LxERP.t8('If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".', backupdir) | html %]
-  

-
-  
-  
-
-  
-  
-
- 

-
-
-
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
new file mode 100644
index 000000000..280db9d67
--- /dev/null
+++ b/templates/webpages/am/config.html
@@ -0,0 +1,274 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+  
[% title %]

+ 

+
+ 

+
+  
+
+  
+  
+
+  

+
+   

+
+    
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+    
[% 'Name' | $T8 %]
[% 'Password' | $T8 %]
+       [%- IF CAN_CHANGE_PASSWORD %]
+       
+       [%- ELSE %]
+       
+       [%- END %]
+      
[% 'E-mail' | $T8 %]
[% 'Signature' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Company' | $T8 %]
[% 'Address' | $T8 %]

+
+    

+   

+
+   

+
+    
+     
+      
+      
+     
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+    
[% 'Date Format' | $T8 %]
+       
+      
[% 'Output Number Format' | $T8 %]
+       
+      
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %]
+       
+      
[% 'Stylesheet' | $T8 %]
+       
+      
[% 'Setup Menu' | $T8 %]
+       
+      
[% 'Favorites' | $T8 %]
[% 'Form details (second row)' | $T8 %]
+       
+      
[% 'Show custom variable search inputs' | $T8 %]
+       
+      

+
+    

+   

+
+   

+
+    
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+    
[% 'Default template format' | $T8 %]
+       
+      
[% 'Default output medium' | $T8 %]
+       
+      
[% 'Default printer' | $T8 %]
+       
+      
[% 'Number of copies' | $T8 %]

+
+    

+   

+
+   

+
+    
+     
+      
+      
+     
+
+     
+      
+     
+
+     
+      
+      
+      
+     
+
+     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
+     
+      
+      
+      
+     
+     [%- END %]
+    
[% 'Show your TODO list after loggin in' | $T8 %]
+       
+       
+       
+       
+      
[% 'Configuration of individual TODO items' | $T8 %]
[% 'Show follow ups...' | $T8 %]
+       
+       
+      
+       
+       
+      
[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]
+       
+       
+      
+       
+       
+      

+
+    

+   

+  

+
+  

+ 

+
+ 
+
+
+
diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
deleted file mode 100644
index 280db9d67..000000000
--- a/templates/webpages/am/config_master.html
+++ /dev/null
@@ -1,274 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-  
[% title %]

- 

-
- 

-
-  
-
-  
-  
-
-  

-
-   

-
-    
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-    
[% 'Name' | $T8 %]
[% 'Password' | $T8 %]
-       [%- IF CAN_CHANGE_PASSWORD %]
-       
-       [%- ELSE %]
-       
-       [%- END %]
-      
[% 'E-mail' | $T8 %]
[% 'Signature' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Company' | $T8 %]
[% 'Address' | $T8 %]

-
-    

-   

-
-   

-
-    
-     
-      
-      
-     
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-    
[% 'Date Format' | $T8 %]
-       
-      
[% 'Output Number Format' | $T8 %]
-       
-      
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %]
-       
-      
[% 'Stylesheet' | $T8 %]
-       
-      
[% 'Setup Menu' | $T8 %]
-       
-      
[% 'Favorites' | $T8 %]
[% 'Form details (second row)' | $T8 %]
-       
-      
[% 'Show custom variable search inputs' | $T8 %]
-       
-      

-
-    

-   

-
-   

-
-    
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-    
[% 'Default template format' | $T8 %]
-       
-      
[% 'Default output medium' | $T8 %]
-       
-      
[% 'Default printer' | $T8 %]
-       
-      
[% 'Number of copies' | $T8 %]

-
-    

-   

-
-   

-
-    
-     
-      
-      
-     
-
-     
-      
-     
-
-     
-      
-      
-      
-     
-
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
-     
-      
-      
-      
-     
-     [%- END %]
-    
[% 'Show your TODO list after loggin in' | $T8 %]
-       
-       
-       
-       
-      
[% 'Configuration of individual TODO items' | $T8 %]
[% 'Show follow ups...' | $T8 %]
-       
-       
-      
-       
-       
-      
[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]
-       
-       
-      
-       
-       
-      

-
-    

-   

-  

-
-  

- 

-
- 
-
-
-
diff --git a/templates/webpages/am/confirm_delete_warehouse.html b/templates/webpages/am/confirm_delete_warehouse.html
new file mode 100644
index 000000000..541b29a71
--- /dev/null
+++ b/templates/webpages/am/confirm_delete_warehouse.html
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 
[% 'Do you really want to delete this warehouse?' | $T8 %]

+
+ 
[% 'Warehouse' | $T8 %]: [% HTML.escape(orig_description) %]

+
+ 

+
+  
+  
+  
+  
+
+  
+  
+ 

+
+
+
diff --git a/templates/webpages/am/confirm_delete_warehouse_master.html b/templates/webpages/am/confirm_delete_warehouse_master.html
deleted file mode 100644
index 541b29a71..000000000
--- a/templates/webpages/am/confirm_delete_warehouse_master.html
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 
[% 'Do you really want to delete this warehouse?' | $T8 %]

-
- 
[% 'Warehouse' | $T8 %]: [% HTML.escape(orig_description) %]

-
- 

-
-  
-  
-  
-  
-
-  
-  
- 

-
-
-
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
new file mode 100644
index 000000000..6ccb7a20e
--- /dev/null
+++ b/templates/webpages/am/edit_accounts.html
@@ -0,0 +1,213 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+    
+  
+
[% title %]

+
+

+  
+    [% 'Main Preferences' | $T8 %]
+  
+  
+    
+      
+        
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  

+        

+        
+      

+        
+      

+

+

+  [% 'Account Type' | $T8 %]
+  
+

+
+[% IF ChartTypeIsAccount %]
+

+  [% 'Is this a summary account to record' | $T8 %]
+    
+     [% 'AR' | $T8 %]
+    
+     [% 'AP' | $T8 %]
+    
+     [% 'Inventory' | $T8 %]
+

+
+

+  [% 'Include in drop-down menus' | $T8 %]
+  
[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $T8 %]

+  
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+  
[% 'Receivables' | $T8 %][% 'Payables' | $T8 %][% 'Parts Inventory' | $T8 %][% 'Service Items' | $T8 %]

+         
+        [% 'Revenue' | $T8 %] 

+         
+        [% 'Receipt' | $T8 %] 

+         
+        [% 'Tax' | $T8 %]
+      		
+         
+        [% 'Expense/Asset' | $T8 %] 

+         
+        [% 'Payment' | $T8 %] 

+         
+        [% 'Tax' | $T8 %]
+      		
+         
+        [% 'Revenue' | $T8 %] 

+         
+        [% 'Expense' | $T8 %] 

+         
+        [% 'Tax' | $T8 %]
+      		
+         
+        [% 'Revenue' | $T8 %] 

+         
+        [% 'Expense' | $T8 %] 

+         
+        [% 'Tax' | $T8 %]
+      

+

+
+

+  
+    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
+  
+  
[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]

+
+            
+[% IF account_exists %]
+              
+                
+                
+                
+                
+              
+[% FOREACH tk = ACCOUNT_TAXKEYS %]
+              
+    [% IF tk.id %]
+                
+                
+                
+                
+                
+    [% ELSE %]
+                
+                
+                
+                
+                
+    [% END %]
+              
+
+[% END %]
+[% ELSE %]
+
+  
+
+[% END %]
+            
[% 'Taxkey' | $T8 %][% 'valid from' | $T8 %][% 'pos_ustva' | $T8 %][% 'delete' | $T8 %] ? 
 
[% 'Save account first to insert taxkeys' | $T8 %]

+  

+

+
+

+  [% 'Report and misc. Preferences' | $T8 %]
+  
+        
+          
+          
+        
+        
+          
+          
+        
+        
+        
+        
+          
+          
+        
+        
+          
+          
+          
+          
+        
+  
[% 'EUER' | $T8 %]
[% 'BWA' | $T8 %]
[% 'Datevautomatik' | $T8 %]
[% 'Folgekonto' | $T8 %][% 'Valid from' | $T8 %]

+[% END %]
+

+

diff --git a/templates/webpages/am/edit_accounts_master.html b/templates/webpages/am/edit_accounts_master.html
deleted file mode 100644
index 6ccb7a20e..000000000
--- a/templates/webpages/am/edit_accounts_master.html
+++ /dev/null
@@ -1,213 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-    
-  
-
[% title %]

-
-

-  
-    [% 'Main Preferences' | $T8 %]
-  
-  
-    
-      
-        
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  

-        

-        
-      

-        
-      

-

-

-  [% 'Account Type' | $T8 %]
-  
-

-
-[% IF ChartTypeIsAccount %]
-

-  [% 'Is this a summary account to record' | $T8 %]
-    
-     [% 'AR' | $T8 %]
-    
-     [% 'AP' | $T8 %]
-    
-     [% 'Inventory' | $T8 %]
-

-
-

-  [% 'Include in drop-down menus' | $T8 %]
-  
[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $T8 %]

-  
-    
-      
-      
-      
-      
-    
-    
-      
-      
-      
-      
-    
-  
[% 'Receivables' | $T8 %][% 'Payables' | $T8 %][% 'Parts Inventory' | $T8 %][% 'Service Items' | $T8 %]

-         
-        [% 'Revenue' | $T8 %] 

-         
-        [% 'Receipt' | $T8 %] 

-         
-        [% 'Tax' | $T8 %]
-      		
-         
-        [% 'Expense/Asset' | $T8 %] 

-         
-        [% 'Payment' | $T8 %] 

-         
-        [% 'Tax' | $T8 %]
-      		
-         
-        [% 'Revenue' | $T8 %] 

-         
-        [% 'Expense' | $T8 %] 

-         
-        [% 'Tax' | $T8 %]
-      		
-         
-        [% 'Revenue' | $T8 %] 

-         
-        [% 'Expense' | $T8 %] 

-         
-        [% 'Tax' | $T8 %]
-      

-

-
-

-  
-    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
-  
-  
[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]

-
-            
-[% IF account_exists %]
-              
-                
-                
-                
-                
-              
-[% FOREACH tk = ACCOUNT_TAXKEYS %]
-              
-    [% IF tk.id %]
-                
-                
-                
-                
-                
-    [% ELSE %]
-                
-                
-                
-                
-                
-    [% END %]
-              
-
-[% END %]
-[% ELSE %]
-
-  
-
-[% END %]
-            
[% 'Taxkey' | $T8 %][% 'valid from' | $T8 %][% 'pos_ustva' | $T8 %][% 'delete' | $T8 %] ? 
 
[% 'Save account first to insert taxkeys' | $T8 %]

-  

-

-
-

-  [% 'Report and misc. Preferences' | $T8 %]
-  
-        
-          
-          
-        
-        
-          
-          
-        
-        
-        
-        
-          
-          
-        
-        
-          
-          
-          
-          
-        
-  
[% 'EUER' | $T8 %]
[% 'BWA' | $T8 %]
[% 'Datevautomatik' | $T8 %]
[% 'Folgekonto' | $T8 %][% 'Valid from' | $T8 %]

-[% END %]
-

-

diff --git a/templates/webpages/am/edit_defaults.html b/templates/webpages/am/edit_defaults.html
new file mode 100644
index 000000000..ff5cf0420
--- /dev/null
+++ b/templates/webpages/am/edit_defaults.html
@@ -0,0 +1,169 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 
+
+  
+
+  

+   
+    
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+ 
+     
+    
+
+   
[% 'Ranges of numbers' | $T8 %]
[% 'Last Invoice Number' | $T8 %][% 'Last Customer Number' | $T8 %]
[% 'Last Credit Note Number' | $T8 %][% 'Last Vendor Number' | $T8 %]
[% 'Last Sales Order Number' | $T8 %]
[% 'Last Purchase Order Number' | $T8 %][% 'Last Article Number' | $T8 %]
[% 'Last Sales Quotation Number' | $T8 %][% 'Last Service Number' | $T8 %]
[% 'Last RFQ Number' | $T8 %]
[% 'Last Sales Delivery Order Number' | $T8 %][% 'Last Purchase Delivery Order Number' | $T8 %]
[% 'Default Accounts' | $T8 %]
[% 'Inventory Account' | $T8 %]
+      
+     
[% 'Revenue Account' | $T8 %]
+      
+     
[% 'Expense Account' | $T8 %]
+      
+     
[% 'Foreign Exchange Gain' | $T8 %]
+      
+     
[% 'Foreign Exchange Loss' | $T8 %]
+      
+     
[% 'Miscellaneous' | $T8 %]
[% 'Business Number' | $T8 %]
[% 'Year End' | $T8 %] (mm/dd)
[% 'Currencies' | $T8 %] (1)
[% 'Weight unit' | $T8 %]
+      [%- INCLUDE 'generic/multibox.html'
+           name          = 'weightunit',
+           default       = defaults_weightunit,
+           style         = 'size:20; maxength:5',
+           DATA          = ALL_UNITS,
+           id_key        = 'name',
+           label_key     = 'name',
+           -%]
+      

+  

+
+  

+
+  

+
+  

+
+  

+   (1) [% 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
+  

+ 

+
+
+
diff --git a/templates/webpages/am/edit_defaults_master.html b/templates/webpages/am/edit_defaults_master.html
deleted file mode 100644
index ff5cf0420..000000000
--- a/templates/webpages/am/edit_defaults_master.html
+++ /dev/null
@@ -1,169 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 

-
-  
-
-  

-   
-    
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
- 
-     
-    
-
-   
[% 'Ranges of numbers' | $T8 %]
[% 'Last Invoice Number' | $T8 %][% 'Last Customer Number' | $T8 %]
[% 'Last Credit Note Number' | $T8 %][% 'Last Vendor Number' | $T8 %]
[% 'Last Sales Order Number' | $T8 %]
[% 'Last Purchase Order Number' | $T8 %][% 'Last Article Number' | $T8 %]
[% 'Last Sales Quotation Number' | $T8 %][% 'Last Service Number' | $T8 %]
[% 'Last RFQ Number' | $T8 %]
[% 'Last Sales Delivery Order Number' | $T8 %][% 'Last Purchase Delivery Order Number' | $T8 %]
[% 'Default Accounts' | $T8 %]
[% 'Inventory Account' | $T8 %]
-      
-     
[% 'Revenue Account' | $T8 %]
-      
-     
[% 'Expense Account' | $T8 %]
-      
-     
[% 'Foreign Exchange Gain' | $T8 %]
-      
-     
[% 'Foreign Exchange Loss' | $T8 %]
-      
-     
[% 'Miscellaneous' | $T8 %]
[% 'Business Number' | $T8 %]
[% 'Year End' | $T8 %] (mm/dd)
[% 'Currencies' | $T8 %] (1)
[% 'Weight unit' | $T8 %]
-      [%- INCLUDE 'generic/multibox.html'
-           name          = 'weightunit',
-           default       = defaults_weightunit,
-           style         = 'size:20; maxength:5',
-           DATA          = ALL_UNITS,
-           id_key        = 'name',
-           label_key     = 'name',
-           -%]
-      

-  

-
-  

-
-  

-
-  

-
-  

-   (1) [% 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
-  

- 

-
-
-
diff --git a/templates/webpages/am/edit_price_factor.html b/templates/webpages/am/edit_price_factor.html
new file mode 100644
index 000000000..105f8b30f
--- /dev/null
+++ b/templates/webpages/am/edit_price_factor.html
@@ -0,0 +1,36 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
+
+ 
[% title %]

+
+ 

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+   
[% 'Description' | $T8 %]
[% 'Factor' | $T8 %]

+  

+
+  

+   
+
+   
+
+   
+   
+   [% IF id %][% IF orphaned %][% END %][% END %]
+  

+ 

+
+
+
diff --git a/templates/webpages/am/edit_price_factor_master.html b/templates/webpages/am/edit_price_factor_master.html
deleted file mode 100644
index 105f8b30f..000000000
--- a/templates/webpages/am/edit_price_factor_master.html
+++ /dev/null
@@ -1,36 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
-
- 
[% title %]

-
- 

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-   
[% 'Description' | $T8 %]
[% 'Factor' | $T8 %]

-  

-
-  

-   
-
-   
-
-   
-   
-   [% IF id %][% IF orphaned %][% END %][% END %]
-  

- 

-
-
-
diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
new file mode 100644
index 000000000..c495e6913
--- /dev/null
+++ b/templates/webpages/am/edit_tax.html
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[% USE HTML %]
+ 

+  
+  
+
+  
[% 'Tax-O-Matic' | $T8 %] [% title %]

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+  
[% 'tax_taxkey' | $T8 %]
[% 'tax_taxdescription' | $T8 %]
[% 'tax_percent' | $T8 %] %
[% 'tax_chartaccno' | $T8 %]

+
+  [% UNLESS orphaned %]
+  

+  [% 'Chartaccounts connected to this Tax:' | $T8 %]
+  [% FOREACH row = TAXINUSE %]
+  [% HTML.escape(row.accno) %] 
+  [% END %]
+  

+  [% END %]
+
+  
+
+  
+
+  [% IF orphaned %]
+  
+  [% END %]
+
+

+
+
+
diff --git a/templates/webpages/am/edit_tax_master.html b/templates/webpages/am/edit_tax_master.html
deleted file mode 100644
index c495e6913..000000000
--- a/templates/webpages/am/edit_tax_master.html
+++ /dev/null
@@ -1,52 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- 

-  
-  
-
-  
[% 'Tax-O-Matic' | $T8 %] [% title %]

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-  
[% 'tax_taxkey' | $T8 %]
[% 'tax_taxdescription' | $T8 %]
[% 'tax_percent' | $T8 %] %
[% 'tax_chartaccno' | $T8 %]

-
-  [% UNLESS orphaned %]
-  

-  [% 'Chartaccounts connected to this Tax:' | $T8 %]
-  [% FOREACH row = TAXINUSE %]
-  [% HTML.escape(row.accno) %] 
-  [% END %]
-  

-  [% END %]
-
-  
-
-  
-
-  [% IF orphaned %]
-  
-  [% END %]
-
-

-
-
-
diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html
new file mode 100644
index 000000000..70f66fbc6
--- /dev/null
+++ b/templates/webpages/am/edit_templates.html
@@ -0,0 +1,79 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 

+
+  [% FOREACH var = HIDDEN %][% END %]
+
+  [% IF SHOW_EDIT_OPTIONS %]
+   

+    [% 'Template' | $T8 %]
+    
+
+    [% IF LANGUAGE.size %]
+     [% 'Language' | $T8 %]
+     
+    [% END %]
+
+    [% IF PRINTER.size %]
+     [% 'Printer' | $T8 %]
+     
+    [% END %]
+
+    
+
+    
+
+   

+
+   

+  [% END %]
+
+
+
+  [% IF SHOW_CONTENT %]
+   

+    

+     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
+    

+   

+
+   [% IF CAN_EDIT %]
+    

+
+    

+     
+     
+     
+    

+
+    [% ELSE %]
+
+    
+
+    

+
+    
[% HTML.escape(content) %]

+
+    [% IF SHOW_SECOND_EDIT_BUTTON %]
+     

+    [% END %]
+
+   [% END %] 
+
+  [% END %] 
+
+ 

+
+
+
diff --git a/templates/webpages/am/edit_templates_master.html b/templates/webpages/am/edit_templates_master.html
deleted file mode 100644
index 70f66fbc6..000000000
--- a/templates/webpages/am/edit_templates_master.html
+++ /dev/null
@@ -1,79 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 

-
-  [% FOREACH var = HIDDEN %][% END %]
-
-  [% IF SHOW_EDIT_OPTIONS %]
-   

-    [% 'Template' | $T8 %]
-    
-
-    [% IF LANGUAGE.size %]
-     [% 'Language' | $T8 %]
-     
-    [% END %]
-
-    [% IF PRINTER.size %]
-     [% 'Printer' | $T8 %]
-     
-    [% END %]
-
-    
-
-    
-
-   

-
-   

-  [% END %]
-
-
-
-  [% IF SHOW_CONTENT %]
-   

-    

-     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
-    

-   

-
-   [% IF CAN_EDIT %]
-    

-
-    

-     
-     
-     
-    

-
-    [% ELSE %]
-
-    
-
-    

-
-    
[% HTML.escape(content) %]

-
-    [% IF SHOW_SECOND_EDIT_BUTTON %]
-     

-    [% END %]
-
-   [% END %] 
-
-  [% END %] 
-
- 

-
-
-
diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
new file mode 100644
index 000000000..649447013
--- /dev/null
+++ b/templates/webpages/am/edit_units.html
@@ -0,0 +1,138 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF saved_message %]
+  
[% saved_message %]

+
+  

+ [% END %]
+
+ 

+
+ 
+
+ 
+  
+   
+  
+  
+ 
[% title %]

+
+ 

+  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit auswählen, dann müssen Sie auch einen Faktor eingeben. Sie müssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von "kg" mit der Basiseinheit "g" und dem Faktor 1000 zulässig, die Definition von "g" mit der Basiseinheit "kg" und dem Faktor "0,001" hingegen nicht.
+ 

+
+ 

+
+ 
+  
+ 
[% 'Add unit' | $T8 %]

+
+ 
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+
+  [% FOREACH language = LANGUAGES %]
+   
+    
+    
+    
+    
+   
+  [% END %]
+ 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
+    
+   
[% 'Factor' | $T8 %]
[% language.description %][% 'Plural' | $T8 %]

+
+ 
+
+ 

+
+ 
+  
+ 
[% 'Edit units' | $T8 %]

+
+ 

+  [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
+ 

+
+ 

+  [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
+ 

+
+ 

+  [% 'You can declare different translations for singular and plural for each unit (e.g. "day" and "days).' | $T8 %]
+ 

+
+ 
+  
+   
+   
+   
+   
+   
+   [% FOREACH language = LANGUAGES %]
+    
+   [% END %]
+  
+
+  [% FOREACH row = UNITS %]
+   
+    
+    [% IF row.in_use %]
+     
+
+     
+     
+     
+
+     [% ELSE %]
+
+     
+     
+     
+     
+    [% END %]
+
+    [% FOREACH language = row.UNITLANGUAGES %]
+     
+    [% END %]
+   
+
+   [% IF loop.last %][% END %]
+  [% END %]
+ 
[% 'up' | $T8 %][% 'down' | $T8 %][% 'Delete' | $T8 %][% 'Unit' | $T8 %][% 'Base unit' | $T8 %][% 'Factor' | $T8 %][% language.description %]
[% IF loop.first %][% ELSE %][% 'up' | $T8 %][% END %][% IF loop.last %][% ELSE %][% 'down' | $T8 %][% END %]
+      
+      
+     [% HTML.escape(row.name) %][% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %][% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]
+      
+      
+     
+      
+     
+      [% 'singular first char' | $T8 %]:
+      
+      [% 'plural first char' | $T8 %]:
+      
+     

+
+ 
+
+ 

+
+
+
diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html
deleted file mode 100644
index 649447013..000000000
--- a/templates/webpages/am/edit_units_master.html
+++ /dev/null
@@ -1,138 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF saved_message %]
-  
[% saved_message %]

-
-  

- [% END %]
-
- 

-
- 
-
- 
-  
-   
-  
-  
- 
[% title %]

-
- 

-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit auswählen, dann müssen Sie auch einen Faktor eingeben. Sie müssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von "kg" mit der Basiseinheit "g" und dem Faktor 1000 zulässig, die Definition von "g" mit der Basiseinheit "kg" und dem Faktor "0,001" hingegen nicht.
- 

-
- 

-
- 
-  
- 
[% 'Add unit' | $T8 %]

-
- 
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-
-  [% FOREACH language = LANGUAGES %]
-   
-    
-    
-    
-    
-   
-  [% END %]
- 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
-    
-   
[% 'Factor' | $T8 %]
[% language.description %][% 'Plural' | $T8 %]

-
- 
-
- 

-
- 
-  
- 
[% 'Edit units' | $T8 %]

-
- 

-  [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
- 

-
- 

-  [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
- 

-
- 

-  [% 'You can declare different translations for singular and plural for each unit (e.g. "day" and "days).' | $T8 %]
- 

-
- 
-  
-   
-   
-   
-   
-   
-   [% FOREACH language = LANGUAGES %]
-    
-   [% END %]
-  
-
-  [% FOREACH row = UNITS %]
-   
-    
-    [% IF row.in_use %]
-     
-
-     
-     
-     
-
-     [% ELSE %]
-
-     
-     
-     
-     
-    [% END %]
-
-    [% FOREACH language = row.UNITLANGUAGES %]
-     
-    [% END %]
-   
-
-   [% IF loop.last %][% END %]
-  [% END %]
- 
[% 'up' | $T8 %][% 'down' | $T8 %][% 'Delete' | $T8 %][% 'Unit' | $T8 %][% 'Base unit' | $T8 %][% 'Factor' | $T8 %][% language.description %]
[% IF loop.first %][% ELSE %][% 'up' | $T8 %][% END %][% IF loop.last %][% ELSE %][% 'down' | $T8 %][% END %]
-      
-      
-     [% HTML.escape(row.name) %][% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %][% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]
-      
-      
-     
-      
-     
-      [% 'singular first char' | $T8 %]:
-      
-      [% 'plural first char' | $T8 %]:
-      
-     

-
- 
-
- 

-
-
-
diff --git a/templates/webpages/am/edit_warehouse.html b/templates/webpages/am/edit_warehouse.html
new file mode 100644
index 000000000..c7ca819af
--- /dev/null
+++ b/templates/webpages/am/edit_warehouse.html
@@ -0,0 +1,112 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 

+
+  
+
+  
+  
+
+  
[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Description' | $T8 %]
+     
+     
+    
[% 'Invalid' | $T8 %]
[% 'Number of new bins' | $T8 %]
[%- 'Prefix for the new bins\' names' | $T8 %]

+
+  

+   
+   [%- IF id %][%- UNLESS in_use %]
+   
+   [%- END %][%- END %]
+  

+
+ 

+
+ [% IF id %]
+
+ 

+
+ 
[% 'Edit Bins' | $T8 %]

+
+ [% UNLESS BINS.size %]
+ 
[% 'No bins have been added to this warehouse yet.' | $T8 %]

+
+ [% ELSE %]
+
+ 

+  [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' | $T8 %]
+ 

+
+ 

+
+  
+
+  
+  
+
+  
+   
+    
+    
+   
+   [%- SET row_odd = '1' %]
+   [%- USE bin_it = Iterator(BINS) %]
+   [%- FOREACH bin = bin_it %]
+   [%- IF row_odd %]
+   
+    [%- END %]
+
+    
+    
+
+    [%- SET end_tr = '0' %]
+    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
+    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
+    [%- IF end_tr %]
+   
+   [%- END %]
+
+   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
+   [%- END %]
+  
[% 'Delete' | $T8 %][% 'Description' | $T8 %][% 'Delete' | $T8 %][% 'Description' | $T8 %]
[% IF bin.in_use %] [% ELSE %][% END %]
+     
+     
+    

+
+  
+
+  

+ 

+
+ [% END %]
+
+ [% END %]
+
+
+
diff --git a/templates/webpages/am/edit_warehouse_master.html b/templates/webpages/am/edit_warehouse_master.html
deleted file mode 100644
index c7ca819af..000000000
--- a/templates/webpages/am/edit_warehouse_master.html
+++ /dev/null
@@ -1,112 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 

-
-  
-
-  
-  
-
-  
[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Description' | $T8 %]
-     
-     
-    
[% 'Invalid' | $T8 %]
[% 'Number of new bins' | $T8 %]
[%- 'Prefix for the new bins\' names' | $T8 %]

-
-  

-   
-   [%- IF id %][%- UNLESS in_use %]
-   
-   [%- END %][%- END %]
-  

-
- 

-
- [% IF id %]
-
- 

-
- 
[% 'Edit Bins' | $T8 %]

-
- [% UNLESS BINS.size %]
- 
[% 'No bins have been added to this warehouse yet.' | $T8 %]

-
- [% ELSE %]
-
- 

-  [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' | $T8 %]
- 

-
- 

-
-  
-
-  
-  
-
-  
-   
-    
-    
-   
-   [%- SET row_odd = '1' %]
-   [%- USE bin_it = Iterator(BINS) %]
-   [%- FOREACH bin = bin_it %]
-   [%- IF row_odd %]
-   
-    [%- END %]
-
-    
-    
-
-    [%- SET end_tr = '0' %]
-    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
-    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
-    [%- IF end_tr %]
-   
-   [%- END %]
-
-   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
-   [%- END %]
-  
[% 'Delete' | $T8 %][% 'Description' | $T8 %][% 'Delete' | $T8 %][% 'Description' | $T8 %]
[% IF bin.in_use %] [% ELSE %][% END %]
-     
-     
-    

-
-  
-
-  

- 

-
- [% END %]
-
- [% END %]
-
-
-
diff --git a/templates/webpages/am/list_account_details.html b/templates/webpages/am/list_account_details.html
new file mode 100644
index 000000000..884dc7d2b
--- /dev/null
+++ b/templates/webpages/am/list_account_details.html
@@ -0,0 +1,64 @@
+[%- USE T8 %]
+[% USE HTML %] [% FOREACH row = CA %]
+
+
+ +  +  +  +  +  +  + 
+
+ 
+  
+  
+ 
+
+ 
+  
+ 
+
+ 
+  
+ 
+
+ 
+  
+  
+  
+  
+  
+ 
+
+ 
+  
+  
+  
+  
+  
+ 
+
+ 
+  
+ 
+
+ 
+  
+  
+  
+  
+ 
+
+ 
+  
+  
+  
+  
+ 
+








[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %][% HTML.escape(row.category) %] 

+   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
+  
[% 'Taxlink_coa' | $T8 %]
[% 'Taxkey_coa' | $T8 %][% 'Taxaccount_coa' | $T8 %][% 'Taxdescription_coa' | $T8 %][% 'Posustva_coa' | $T8 %][% 'Startdate_coa' | $T8 %]
[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '
')         %][% ELSE %]-[% END %]		[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '
')     %][% ELSE %]-[% END %]		[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '
') %][% ELSE %]-[% END %]		[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '
')       %][% ELSE %]-[% END %]		[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '
')      %][% ELSE %]-[% END %]
[% 'Report Positions' | $T8 %]
[% 'pos_bwa' | $T8 %][% 'pos_bilanz' | $T8 %][% 'pos_eur' | $T8 %][% 'Datevautomatik' | $T8 %]
[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %][% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %][% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %][% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]

+
+[% END %]
diff --git a/templates/webpages/am/list_account_details_master.html b/templates/webpages/am/list_account_details_master.html
deleted file mode 100644
index 884dc7d2b..000000000
--- a/templates/webpages/am/list_account_details_master.html
+++ /dev/null
@@ -1,64 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %] [% FOREACH row = CA %]
-
-
- -  -  -  -  -  -  - 
-
- 
-  
-  
- 
-
- 
-  
- 
-
- 
-  
- 
-
- 
-  
-  
-  
-  
-  
- 
-
- 
-  
-  
-  
-  
-  
- 
-
- 
-  
- 
-
- 
-  
-  
-  
-  
- 
-
- 
-  
-  
-  
-  
- 
-








[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %][% HTML.escape(row.category) %] 

-   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
-  
[% 'Taxlink_coa' | $T8 %]
[% 'Taxkey_coa' | $T8 %][% 'Taxaccount_coa' | $T8 %][% 'Taxdescription_coa' | $T8 %][% 'Posustva_coa' | $T8 %][% 'Startdate_coa' | $T8 %]
[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '
')         %][% ELSE %]-[% END %]		[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '
')     %][% ELSE %]-[% END %]		[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '
') %][% ELSE %]-[% END %]		[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '
')       %][% ELSE %]-[% END %]		[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '
')      %][% ELSE %]-[% END %]
[% 'Report Positions' | $T8 %]
[% 'pos_bwa' | $T8 %][% 'pos_bilanz' | $T8 %][% 'pos_eur' | $T8 %][% 'Datevautomatik' | $T8 %]
[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %][% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %][% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %][% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]

-
-[% END %]
diff --git a/templates/webpages/am/list_accounts.html b/templates/webpages/am/list_accounts.html
new file mode 100644
index 000000000..8392bf55f
--- /dev/null
+++ b/templates/webpages/am/list_accounts.html
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 


+
+ 
[% title %]

+
+ 

+
+ 
+
+  +   +   +   +   +   +   +  
+
+  
+   
+   
+   
+   
+  
+
+  [% SET row_odd = '1' %][% FOREACH row = CA %]
+
+  [% IF row.heading %]
+  
+   
+   
+  
+
+  [% ELSE %]
+
+  
+
+   
+
+   
+   
+
+    
+    
+  
+
+  
+   
+  
+
+  [% END %]
+
+  [% END %]
+
+ 








[% 'Account' | $T8 %][% 'Description (Click on Description for details)' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %]
[% HTML.escape(row.accno) %][% HTML.escape(row.description) %]

+
+
+
diff --git a/templates/webpages/am/list_accounts_master.html b/templates/webpages/am/list_accounts_master.html
deleted file mode 100644
index 8392bf55f..000000000
--- a/templates/webpages/am/list_accounts_master.html
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 


-
- 
[% title %]

-
- 

-
- 
-
-  -   -   -   -   -   -   -  
-
-  
-   
-   
-   
-   
-  
-
-  [% SET row_odd = '1' %][% FOREACH row = CA %]
-
-  [% IF row.heading %]
-  
-   
-   
-  
-
-  [% ELSE %]
-
-  
-
-   
-
-   
-   
-
-    
-    
-  
-
-  
-   
-  
-
-  [% END %]
-
-  [% END %]
-
- 








[% 'Account' | $T8 %][% 'Description (Click on Description for details)' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %]
[% HTML.escape(row.accno) %][% HTML.escape(row.description) %]

-
-
-
diff --git a/templates/webpages/am/list_price_factors.html b/templates/webpages/am/list_price_factors.html
new file mode 100644
index 000000000..73c9f3130
--- /dev/null
+++ b/templates/webpages/am/list_price_factors.html
@@ -0,0 +1,40 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
+
+ 
[% title %]

+
+ 

+  
+   
+    
+    
+    
+    
+   
+
+   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
+   
+    
+    
+    
+    
+   
+   [% END %]
+  
[% 'Description' | $T8 %][% 'Factor' | $T8 %]
[% IF factor.previous_id %][% END %][% IF factor.next_id %][% END %][% HTML.escape(factor.description) %][% HTML.escape(factor.factor) %]

+ 

+
+ 

+
+ 

+  

+   
+   
+
+   
+  

+ 

+
+
+
diff --git a/templates/webpages/am/list_price_factors_master.html b/templates/webpages/am/list_price_factors_master.html
deleted file mode 100644
index 73c9f3130..000000000
--- a/templates/webpages/am/list_price_factors_master.html
+++ /dev/null
@@ -1,40 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
-
- 
[% title %]

-
- 

-  
-   
-    
-    
-    
-    
-   
-
-   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
-   
-    
-    
-    
-    
-   
-   [% END %]
-  
[% 'Description' | $T8 %][% 'Factor' | $T8 %]
[% IF factor.previous_id %][% END %][% IF factor.next_id %][% END %][% HTML.escape(factor.description) %][% HTML.escape(factor.factor) %]

- 

-
- 

-
- 

-  

-   
-   
-
-   
-  

- 

-
-
-
diff --git a/templates/webpages/am/list_tax.html b/templates/webpages/am/list_tax.html
new file mode 100644
index 000000000..3d24b5177
--- /dev/null
+++ b/templates/webpages/am/list_tax.html
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% title %]

+
+ 
+  
+   
+   
+   
+   
+   
+  
+
+  [% SET row_odd = '1' %][% FOREACH row = TAX %]
+  
+   
+   
+   
+   
+   
+  
+  [% END %]
+ 
[% 'tax_taxkey' | $T8 %][% 'tax_taxdescription' | $T8 %][% 'tax_rate' | $T8 %][% 'taxnumber' | $T8 %][% 'account_description' | $T8 %]
[% HTML.escape(row.taxkey) %][% HTML.escape(row.taxdescription) %][% HTML.escape(row.rate) %] %[% HTML.escape(row.taxnumber) %][% HTML.escape(row.account_description) %]

+
+ 

+  

+
+   
+   
+   
+  

+ 

+
+
+
+
diff --git a/templates/webpages/am/list_tax_master.html b/templates/webpages/am/list_tax_master.html
deleted file mode 100644
index 3d24b5177..000000000
--- a/templates/webpages/am/list_tax_master.html
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% title %]

-
- 
-  
-   
-   
-   
-   
-   
-  
-
-  [% SET row_odd = '1' %][% FOREACH row = TAX %]
-  
-   
-   
-   
-   
-   
-  
-  [% END %]
- 
[% 'tax_taxkey' | $T8 %][% 'tax_taxdescription' | $T8 %][% 'tax_rate' | $T8 %][% 'taxnumber' | $T8 %][% 'account_description' | $T8 %]
[% HTML.escape(row.taxkey) %][% HTML.escape(row.taxdescription) %][% HTML.escape(row.rate) %] %[% HTML.escape(row.taxnumber) %][% HTML.escape(row.account_description) %]

-
- 

-  

-
-   
-   
-   
-  

- 

-
-
-
-
diff --git a/templates/webpages/am/list_warehouses.html b/templates/webpages/am/list_warehouses.html
new file mode 100644
index 000000000..843abe586
--- /dev/null
+++ b/templates/webpages/am/list_warehouses.html
@@ -0,0 +1,41 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF saved_message %]
[% saved_message %]
[% END %]
+
+ 
[% title %]

+
+ 

+  
+   
+    
+    
+    
+    
+    
+   
+
+   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
+   
+    
+    
+    
+    
+    
+   
+   [% END %]
+  
[% 'Description' | $T8 %][% 'Number of bins' | $T8 %][% 'Invalid' | $T8 %]
[% IF warehouse.previous_id %][% END %][% IF warehouse.next_id %][% END %][% HTML.escape(warehouse.description) %][% HTML.escape(warehouse.number_of_bins) %][% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]

+ 

+
+ 

+
+ 

+  

+   
+
+   
+  

+ 

+
+
+
diff --git a/templates/webpages/am/list_warehouses_master.html b/templates/webpages/am/list_warehouses_master.html
deleted file mode 100644
index 843abe586..000000000
--- a/templates/webpages/am/list_warehouses_master.html
+++ /dev/null
@@ -1,41 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF saved_message %]
[% saved_message %]
[% END %]
-
- 
[% title %]

-
- 

-  
-   
-    
-    
-    
-    
-    
-   
-
-   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
-   
-    
-    
-    
-    
-    
-   
-   [% END %]
-  
[% 'Description' | $T8 %][% 'Number of bins' | $T8 %][% 'Invalid' | $T8 %]
[% IF warehouse.previous_id %][% END %][% IF warehouse.next_id %][% END %][% HTML.escape(warehouse.description) %][% HTML.escape(warehouse.number_of_bins) %][% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]

- 

-
- 

-
- 

-  

-   
-
-   
-  

- 

-
-
-
diff --git a/templates/webpages/amcvar/display_cvar_config_form.html b/templates/webpages/amcvar/display_cvar_config_form.html
new file mode 100644
index 000000000..104b46fcd
--- /dev/null
+++ b/templates/webpages/amcvar/display_cvar_config_form.html
@@ -0,0 +1,150 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
[% title %]

+
+ 

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [%- IF module == 'IC' %]
+    
+     
+     
+    
+    [%- END %]
+   
[% 'Module' | $T8 %]
+      [%- INCLUDE generic/multibox.html
+            name      = 'module',
+            id_key    = 'module',
+            label_key = 'description',
+            DATA      = MODULES %]
+     
[% 'Name' | $T8 %](1)
[% 'Description' | $T8 %](2)
[% 'Type' | $T8 %]
+      
+     
[% 'Default value' | $T8 %](3)
[% 'Options' | $T8 %](4)
[% 'Searchable' | $T8 %]
+      
+      
+      
+      
+     
[% 'Includeable in reports' | $T8 %]
+      
+     
[% 'Editable' | $T8 %](5)
+      
+      
+      
+      
+     

+  

+
+  
+
+  

+   
+   [%- IF id %]
+   
+   [%- END %]
+  

+
+  

+
+  
[% 'Annotations' | $T8 %]

+
+  

+   (1) [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]
+  

+
+  

+   (2) [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]
+  

+
+  

+   (3) [% 'The default value depends on the variable type:' | $T8 %]
+   

+   
    
+    
  • [%- 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]
    • 
+    
  • [%- 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]
    • 
+    
  • [%- 'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]
    • 
+   

+  

+
+  

+   (4) [% 'The available options depend on the varibale type:' | $T8 %]
+   

+   
    
+    
  • [%- 'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' | $T8 %]
    • 
+    
  • [%- 'Text field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]
    • 
+    
  • [%- 'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' | $T8 %]
    • 
+    
  • [%- 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' | $T8 %]
    • 
+   

+   

+   [% 'Other values are ignored.' | $T8 %]
+  

+
+  [%- IF module == 'IC' %]
+  

+   (5)
+
+   [%- 'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' | $T8 %]
+
+   [% 'Otherwise the variable is only available for printing.' | $T8 %]
+  

+  [%- END %]
+
+ 

+
+
+
diff --git a/templates/webpages/amcvar/display_cvar_config_form_master.html b/templates/webpages/amcvar/display_cvar_config_form_master.html
deleted file mode 100644
index 104b46fcd..000000000
--- a/templates/webpages/amcvar/display_cvar_config_form_master.html
+++ /dev/null
@@ -1,150 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
[% title %]

-
- 

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [%- IF module == 'IC' %]
-    
-     
-     
-    
-    [%- END %]
-   
[% 'Module' | $T8 %]
-      [%- INCLUDE generic/multibox.html
-            name      = 'module',
-            id_key    = 'module',
-            label_key = 'description',
-            DATA      = MODULES %]
-     
[% 'Name' | $T8 %](1)
[% 'Description' | $T8 %](2)
[% 'Type' | $T8 %]
-      
-     
[% 'Default value' | $T8 %](3)
[% 'Options' | $T8 %](4)
[% 'Searchable' | $T8 %]
-      
-      
-      
-      
-     
[% 'Includeable in reports' | $T8 %]
-      
-     
[% 'Editable' | $T8 %](5)
-      
-      
-      
-      
-     

-  

-
-  
-
-  

-   
-   [%- IF id %]
-   
-   [%- END %]
-  

-
-  

-
-  
[% 'Annotations' | $T8 %]

-
-  

-   (1) [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]
-  

-
-  

-   (2) [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]
-  

-
-  

-   (3) [% 'The default value depends on the variable type:' | $T8 %]
-   

-   
    
-    
  • [%- 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]
    • 
-    
  • [%- 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]
    • 
-    
  • [%- 'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]
    • 
-   

-  

-
-  

-   (4) [% 'The available options depend on the varibale type:' | $T8 %]
-   

-   
    
-    
  • [%- 'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' | $T8 %]
    • 
-    
  • [%- 'Text field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]
    • 
-    
  • [%- 'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' | $T8 %]
    • 
-    
  • [%- 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' | $T8 %]
    • 
-   

-   

-   [% 'Other values are ignored.' | $T8 %]
-  

-
-  [%- IF module == 'IC' %]
-  

-   (5)
-
-   [%- 'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' | $T8 %]
-
-   [% 'Otherwise the variable is only available for printing.' | $T8 %]
-  

-  [%- END %]
-
- 

-
-
-
diff --git a/templates/webpages/amcvar/list_cvar_configs.html b/templates/webpages/amcvar/list_cvar_configs.html
new file mode 100644
index 000000000..f2890f780
--- /dev/null
+++ b/templates/webpages/amcvar/list_cvar_configs.html
@@ -0,0 +1,102 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
+
+ 
[% title %]

+
+ 

+  
+  
+
+  

+   [% 'Custom variables for module' | $T8 %]
+   [%- INCLUDE generic/multibox.html
+         name      = 'module',
+         id_key    = 'module',
+         label_key = 'description',
+         DATA      = MODULES %]
+   
+  

+
+  

+   
+    
+     
+     
+     
+     
+     
+     
+     
+     [%- IF module == 'IC' %]
+     
+     [%- END %]
+    
+
+    [%- FOREACH cfg = CONFIGS %]
+    
+     
+
+     
+
+     
+
+     
+     
+
+     
+
+     
+
+     [%- IF module == 'IC' %]
+     
+     [%- END %]
+    
+    [%- END %]
+   
[% 'Name' | $T8 %][% 'Description' | $T8 %][% 'Type' | $T8 %][% 'Searchable' | $T8 %][% 'Includeable in reports' | $T8 %][% 'Editable' | $T8 %]

+      [%- IF cfg.previous_id %]
+      
+       
+      [%- END %]
+     
+      [%- IF cfg.next_id %]
+      
+       
+      [%- END %]
+     
+      
+       [% HTML.escape(cfg.name) %]
+      
+     [% HTML.escape(cfg.description) %][% HTML.escape(cfg.type_tr) %]
+      [%- IF cfg.searchable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     
+      [%- IF cfg.included_by_default %]
+      [% 'Yes, included by default' | $T8 %]
+      [%- ELSIF cfg.includeable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     
+      [%- IF cfg.flag_editable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     

+  

+
+  

+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/amcvar/list_cvar_configs_master.html b/templates/webpages/amcvar/list_cvar_configs_master.html
deleted file mode 100644
index f2890f780..000000000
--- a/templates/webpages/amcvar/list_cvar_configs_master.html
+++ /dev/null
@@ -1,102 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- [% IF MESSAGE %]
[% MESSAGE %]
[% END %]
-
- 
[% title %]

-
- 

-  
-  
-
-  

-   [% 'Custom variables for module' | $T8 %]
-   [%- INCLUDE generic/multibox.html
-         name      = 'module',
-         id_key    = 'module',
-         label_key = 'description',
-         DATA      = MODULES %]
-   
-  

-
-  

-   
-    
-     
-     
-     
-     
-     
-     
-     
-     [%- IF module == 'IC' %]
-     
-     [%- END %]
-    
-
-    [%- FOREACH cfg = CONFIGS %]
-    
-     
-
-     
-
-     
-
-     
-     
-
-     
-
-     
-
-     [%- IF module == 'IC' %]
-     
-     [%- END %]
-    
-    [%- END %]
-   
[% 'Name' | $T8 %][% 'Description' | $T8 %][% 'Type' | $T8 %][% 'Searchable' | $T8 %][% 'Includeable in reports' | $T8 %][% 'Editable' | $T8 %]

-      [%- IF cfg.previous_id %]
-      
-       
-      [%- END %]
-     
-      [%- IF cfg.next_id %]
-      
-       
-      [%- END %]
-     
-      
-       [% HTML.escape(cfg.name) %]
-      
-     [% HTML.escape(cfg.description) %][% HTML.escape(cfg.type_tr) %]
-      [%- IF cfg.searchable %]
-      [% 'Yes' | $T8 %]
-      [%- ELSE %]
-      [% 'No' | $T8 %]
-      [%- END %]
-     
-      [%- IF cfg.included_by_default %]
-      [% 'Yes, included by default' | $T8 %]
-      [%- ELSIF cfg.includeable %]
-      [% 'Yes' | $T8 %]
-      [%- ELSE %]
-      [% 'No' | $T8 %]
-      [%- END %]
-     
-      [%- IF cfg.flag_editable %]
-      [% 'Yes' | $T8 %]
-      [%- ELSE %]
-      [% 'No' | $T8 %]
-      [%- END %]
-     

-  

-
-  

-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/amcvar/render_checkboxes.html b/templates/webpages/amcvar/render_checkboxes.html
new file mode 100644
index 000000000..3a703d8c3
--- /dev/null
+++ b/templates/webpages/amcvar/render_checkboxes.html
@@ -0,0 +1,3 @@
+[%- USE HTML %]
+[%- SET var_valid = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) _ '_valid' -%]
+
diff --git a/templates/webpages/amcvar/render_checkboxes_master.html b/templates/webpages/amcvar/render_checkboxes_master.html
deleted file mode 100644
index 3a703d8c3..000000000
--- a/templates/webpages/amcvar/render_checkboxes_master.html
+++ /dev/null
@@ -1,3 +0,0 @@
-[%- USE HTML %]
-[%- SET var_valid = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) _ '_valid' -%]
-
diff --git a/templates/webpages/amcvar/render_inputs.html b/templates/webpages/amcvar/render_inputs.html
new file mode 100644
index 000000000..335a77c9f
--- /dev/null
+++ b/templates/webpages/amcvar/render_inputs.html
@@ -0,0 +1,46 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+[%- SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) -%]
+
+[%- IF hide_non_editable && !var.flag_editable %]
+
+
+[%- ELSIF !var.valid %]
+  [%- IF show_disabled_message %]
+[% 'Element disabled' | $T8 %]
+  [%- END %]
+
+[%- ELSIF var.type == 'bool' %]
+
+
+[%- ELSIF var.type == 'textfield' %]
+
+
+[%- ELSIF var.type == 'date' %]
+
+
+
+
+
+[%- ELSIF var.type == 'timestamp' %]
+
+
+[%- ELSIF var.type == 'select' %]
+
+
+
+[%- ELSE %]
+
+[%- END %]
diff --git a/templates/webpages/amcvar/render_inputs_master.html b/templates/webpages/amcvar/render_inputs_master.html
deleted file mode 100644
index 335a77c9f..000000000
--- a/templates/webpages/amcvar/render_inputs_master.html
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-[%- SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) -%]
-
-[%- IF hide_non_editable && !var.flag_editable %]
-
-
-[%- ELSIF !var.valid %]
-  [%- IF show_disabled_message %]
-[% 'Element disabled' | $T8 %]
-  [%- END %]
-
-[%- ELSIF var.type == 'bool' %]
-
-
-[%- ELSIF var.type == 'textfield' %]
-
-
-[%- ELSIF var.type == 'date' %]
-
-
-
-
-
-[%- ELSIF var.type == 'timestamp' %]
-
-
-[%- ELSIF var.type == 'select' %]
-
-
-
-[%- ELSE %]
-
-[%- END %]
diff --git a/templates/webpages/amcvar/search_filter.html b/templates/webpages/amcvar/search_filter.html
new file mode 100644
index 000000000..0bf105e78
--- /dev/null
+++ b/templates/webpages/amcvar/search_filter.html
@@ -0,0 +1,71 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+   [%- FOREACH var = variables %]
+   [%- IF var.searchable %]
+   
+    [% HTML.escape(var.description) %]
+    
+
+     [%- IF var.type == 'bool' %]
+     
+
+     [%- ELSIF var.type == 'date' %]
+     [% 'from (time)' | $T8 %]
+     
+     
+     [% 'to (time)' | $T8 %]
+     
+     
+
+     
+
+     [%- ELSIF var.type == 'number' %]
+     
+     
+
+     [% ELSIF var.type == 'select' %]
+     
+
+     [%- ELSE %]
+     
+
+     [%- END %]
+    
+   
+   [%- END %]
+   [%- END %]
+[% IF hidden_cvar_filters %]
+   [% 'click here to edit cvars' | $T8 %]
+   
+[% END %]
diff --git a/templates/webpages/amcvar/search_filter_master.html b/templates/webpages/amcvar/search_filter_master.html
deleted file mode 100644
index 0bf105e78..000000000
--- a/templates/webpages/amcvar/search_filter_master.html
+++ /dev/null
@@ -1,71 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.searchable %]
-   
-    [% HTML.escape(var.description) %]
-    
-
-     [%- IF var.type == 'bool' %]
-     
-
-     [%- ELSIF var.type == 'date' %]
-     [% 'from (time)' | $T8 %]
-     
-     
-     [% 'to (time)' | $T8 %]
-     
-     
-
-     
-
-     [%- ELSIF var.type == 'number' %]
-     
-     
-
-     [% ELSIF var.type == 'select' %]
-     
-
-     [%- ELSE %]
-     
-
-     [%- END %]
-    
-   
-   [%- END %]
-   [%- END %]
-[% IF hidden_cvar_filters %]
-   [% 'click here to edit cvars' | $T8 %]
-   
-[% END %]
diff --git a/templates/webpages/amcvar/search_include.html b/templates/webpages/amcvar/search_include.html
new file mode 100644
index 000000000..3fd967fb0
--- /dev/null
+++ b/templates/webpages/amcvar/search_include.html
@@ -0,0 +1,25 @@
+[% USE HTML %]
+
+   [%- SET start_new_row = '1' %]
+
+   [%- FOREACH var = variables %]
+   [%- IF var.includeable %]
+   [%- IF start_new_row %]
+   
+    [%- SET start_new_row = '0' %]
+    [%- END %]
+    
+     
+     
+    
+
+    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
+    [%- IF start_new_row || loop.last %]
+   
+   [%- END %]
+   [%- END %]
+   [%- END %]
diff --git a/templates/webpages/amcvar/search_include_master.html b/templates/webpages/amcvar/search_include_master.html
deleted file mode 100644
index 3fd967fb0..000000000
--- a/templates/webpages/amcvar/search_include_master.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-
-   [%- SET start_new_row = '1' %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.includeable %]
-   [%- IF start_new_row %]
-   
-    [%- SET start_new_row = '0' %]
-    [%- END %]
-    
-     
-     
-    
-
-    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
-    [%- IF start_new_row || loop.last %]
-   
-   [%- END %]
-   [%- END %]
-   [%- END %]
diff --git a/templates/webpages/ap/ap_transactions_bottom.html b/templates/webpages/ap/ap_transactions_bottom.html
new file mode 100644
index 000000000..abc51a197
--- /dev/null
+++ b/templates/webpages/ap/ap_transactions_bottom.html
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML %] 

+
+  
+
+  [% 'Create new' | $T8 %]

+
+  
+  
+
+ 

+
+
+
diff --git a/templates/webpages/ap/ap_transactions_bottom_master.html b/templates/webpages/ap/ap_transactions_bottom_master.html
deleted file mode 100644
index abc51a197..000000000
--- a/templates/webpages/ap/ap_transactions_bottom_master.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %] 

-
-  
-
-  [% 'Create new' | $T8 %]

-
-  
-  
-
- 

-
-
-
diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
new file mode 100644
index 000000000..4b1139790
--- /dev/null
+++ b/templates/webpages/ap/search.html
@@ -0,0 +1,188 @@
+[%- USE T8 %]
+
+
+ 

+
+  
+  
+  
+  
+   
+    
+    
+     
+    
+    
+     
+    
+   
[% title %]

+    
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+    
+   
+   
[% 'Vendor' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'vendor',
+                 default       = oldvendor,
+                 style         = 'width: 250px',
+                 DATA          = ALL_VC,
+                 id_sub        = 'vc_keys',
+                 label_key     = 'name',
+                 select        = vc_select,
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 1,
+                 -%]
+      
[% 'Department' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'department',
+                 style         = 'width: 250px',
+                 DATA          = ALL_DEPARTMENTS,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Project Number' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          =  'project_id',
+                 style         = "width: 250px",
+                 DATA          =  ALL_PROJECTS,
+                 id_key        = 'id',
+                 label_key     = 'projectnumber',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      
[% 'From' | $T8 %]
+       
+       
+      [% 'Bis' | $T8 %]
+      
+      
+     

+    

+      
+       
+        
+        
+       
+      
[% 'Include in Report' | $T8 %]
+         
+          
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+         
+         
+          
+         
+         
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+          
+         
[% 'Open' | $T8 %][% 'Closed' | $T8 %]
[% 'ID' | $T8 %][% 'Invoice Number' | $T8 %][% 'Order Number' | $T8 %]
[% 'Vendor' | $T8 %][% 'Invoice Date' | $T8 %][% 'Amount' | $T8 %]
[% 'Tax' | $T8 %][% 'Total' | $T8 %][% 'Date Paid' | $T8 %]
[% 'Paid' | $T8 %][% 'Due Date' | $T8 %][% 'Amount Due' | $T8 %]
[% 'Notes' | $T8 %][% 'Employee' | $T8 %]
[% 'Subtotal' | $T8 %][% 'Project Number' | $T8 %]
[% 'Vendor' | $T8 %] 
[% 'Vendor Number' | $T8 %][% 'Country' | $T8 %][% 'USt-IdNr.' | $T8 %][% 'Steuersatz' | $T8 %]
[% 'Payment Terms' | $T8 %][% 'Buchungskonto' | $T8 %]

+        

+     

+   
+   

+   
+  

+ 
+ 
+
diff --git a/templates/webpages/ap/search_master.html b/templates/webpages/ap/search_master.html
deleted file mode 100644
index 4b1139790..000000000
--- a/templates/webpages/ap/search_master.html
+++ /dev/null
@@ -1,188 +0,0 @@
-[%- USE T8 %]
-
-
- 

-
-  
-  
-  
-  
-   
-    
-    
-     
-    
-    
-     
-    
-   
[% title %]

-    
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-    
-   
-   
[% 'Vendor' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'vendor',
-                 default       = oldvendor,
-                 style         = 'width: 250px',
-                 DATA          = ALL_VC,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 1,
-                 -%]
-      
[% 'Department' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Project Number' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          =  'project_id',
-                 style         = "width: 250px",
-                 DATA          =  ALL_PROJECTS,
-                 id_key        = 'id',
-                 label_key     = 'projectnumber',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      
[% 'From' | $T8 %]
-       
-       
-      [% 'Bis' | $T8 %]
-      
-      
-     

-    

-      
-       
-        
-        
-       
-      
[% 'Include in Report' | $T8 %]
-         
-          
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-         
-         
-          
-         
-         
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-          
-         
[% 'Open' | $T8 %][% 'Closed' | $T8 %]
[% 'ID' | $T8 %][% 'Invoice Number' | $T8 %][% 'Order Number' | $T8 %]
[% 'Vendor' | $T8 %][% 'Invoice Date' | $T8 %][% 'Amount' | $T8 %]
[% 'Tax' | $T8 %][% 'Total' | $T8 %][% 'Date Paid' | $T8 %]
[% 'Paid' | $T8 %][% 'Due Date' | $T8 %][% 'Amount Due' | $T8 %]
[% 'Notes' | $T8 %][% 'Employee' | $T8 %]
[% 'Subtotal' | $T8 %][% 'Project Number' | $T8 %]
[% 'Vendor' | $T8 %] 
[% 'Vendor Number' | $T8 %][% 'Country' | $T8 %][% 'USt-IdNr.' | $T8 %][% 'Steuersatz' | $T8 %]
[% 'Payment Terms' | $T8 %][% 'Buchungskonto' | $T8 %]

-        

-     

-   
-   

-   
-  

- 
- 
-
diff --git a/templates/webpages/ar/ar_transactions_bottom.html b/templates/webpages/ar/ar_transactions_bottom.html
new file mode 100644
index 000000000..57bacca38
--- /dev/null
+++ b/templates/webpages/ar/ar_transactions_bottom.html
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML %] 

+
+  
+
+  [% 'Create new' | $T8 %]

+
+  
+  
+
+ 

+
+
+
diff --git a/templates/webpages/ar/ar_transactions_bottom_master.html b/templates/webpages/ar/ar_transactions_bottom_master.html
deleted file mode 100644
index 57bacca38..000000000
--- a/templates/webpages/ar/ar_transactions_bottom_master.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %] 

-
-  
-
-  [% 'Create new' | $T8 %]

-
-  
-  
-
- 

-
-
-
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
new file mode 100644
index 000000000..cf8c70a54
--- /dev/null
+++ b/templates/webpages/ar/search.html
@@ -0,0 +1,204 @@
+[%- USE T8 %]
+
+
+ 

+
+  
+  
+  
+  
+   
+    
+    
+     
+    
+    
+     
+    
+   
[% title %]

+    
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+      
+      
+     
+     
+    
+   
+   
[% 'Customer' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'customer',
+                 default       = oldcustomer,
+                 style         = 'width: 250px',
+                 DATA          = ALL_VC,
+                 id_sub        = 'vc_keys',
+                 label_key     = 'name',
+                 select        = vc_select,
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 1,
+                 -%]
+      
[% 'Department' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'department',
+                 style         = 'width: 250px',
+                 DATA          = ALL_DEPARTMENTS,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Transaction description' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Project Number' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          =  'project_id',
+                 style         = "width: 250px",
+                 DATA          =  ALL_PROJECTS,
+                 id_key        = 'id',
+                 label_key     = 'projectnumber',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      
[% 'From' | $T8 %]
+       
+       
+      [% 'Bis' | $T8 %]
+      
+      
+     

+    

+      
+       
+        
+        
+       
+      
[% 'Include in Report' | $T8 %]
+         
+          
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+           
+           
+          
+          
+           
+          
+          
+           
+           
+           
+           
+           
+           
+           
+           
+          
+          
+           
+           
+           
+           
+          
+         
[% 'Open' | $T8 %][% 'Closed' | $T8 %]
[% 'ID' | $T8 %][% 'Invoice Number' | $T8 %][% 'Order Number' | $T8 %][% 'Invoice Date' | $T8 %]
[% 'Customer' | $T8 %][% 'Amount' | $T8 %][% 'Tax' | $T8 %][% 'Total' | $T8 %]
[% 'Date Paid' | $T8 %][% 'Paid' | $T8 %][% 'Due Date' | $T8 %][% 'Amount Due' | $T8 %]
[% 'Notes' | $T8 %][% 'Salesperson' | $T8 %][% 'Shipping Point' | $T8 %][% 'Ship via' | $T8 %]
 [% 'Ertrag' | $T8 %] [% 'Ertrag prozentual' | $T8 %][% 'Employee' | $T8 %]
[% 'Subtotal' | $T8 %][% 'Project Number' | $T8 %][% 'Transaction description' | $T8 %]
[% 'Customer' | $T8 %] 
[% 'Customer Number' | $T8 %][% 'Country' | $T8 %][% 'USt-IdNr.' | $T8 %][% 'Steuersatz' | $T8 %]
[% 'Payment Terms' | $T8 %][% 'Buchungskonto' | $T8 %]

+        

+     

+   
+   

+   
+  

+ 
+ 
+
diff --git a/templates/webpages/ar/search_master.html b/templates/webpages/ar/search_master.html
deleted file mode 100644
index cf8c70a54..000000000
--- a/templates/webpages/ar/search_master.html
+++ /dev/null
@@ -1,204 +0,0 @@
-[%- USE T8 %]
-
-
- 

-
-  
-  
-  
-  
-   
-    
-    
-     
-    
-    
-     
-    
-   
[% title %]

-    
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-      
-      
-     
-     
-    
-   
-   
[% 'Customer' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'customer',
-                 default       = oldcustomer,
-                 style         = 'width: 250px',
-                 DATA          = ALL_VC,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 1,
-                 -%]
-      
[% 'Department' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Transaction description' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Project Number' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          =  'project_id',
-                 style         = "width: 250px",
-                 DATA          =  ALL_PROJECTS,
-                 id_key        = 'id',
-                 label_key     = 'projectnumber',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      
[% 'From' | $T8 %]
-       
-       
-      [% 'Bis' | $T8 %]
-      
-      
-     

-    

-      
-       
-        
-        
-       
-      
[% 'Include in Report' | $T8 %]
-         
-          
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-           
-           
-          
-          
-           
-          
-          
-           
-           
-           
-           
-           
-           
-           
-           
-          
-          
-           
-           
-           
-           
-          
-         
[% 'Open' | $T8 %][% 'Closed' | $T8 %]
[% 'ID' | $T8 %][% 'Invoice Number' | $T8 %][% 'Order Number' | $T8 %][% 'Invoice Date' | $T8 %]
[% 'Customer' | $T8 %][% 'Amount' | $T8 %][% 'Tax' | $T8 %][% 'Total' | $T8 %]
[% 'Date Paid' | $T8 %][% 'Paid' | $T8 %][% 'Due Date' | $T8 %][% 'Amount Due' | $T8 %]
[% 'Notes' | $T8 %][% 'Salesperson' | $T8 %][% 'Shipping Point' | $T8 %][% 'Ship via' | $T8 %]
 [% 'Ertrag' | $T8 %] [% 'Ertrag prozentual' | $T8 %][% 'Employee' | $T8 %]
[% 'Subtotal' | $T8 %][% 'Project Number' | $T8 %][% 'Transaction description' | $T8 %]
[% 'Customer' | $T8 %] 
[% 'Customer Number' | $T8 %][% 'Country' | $T8 %][% 'USt-IdNr.' | $T8 %][% 'Steuersatz' | $T8 %]
[% 'Payment Terms' | $T8 %][% 'Buchungskonto' | $T8 %]

-        

-     

-   
-   

-   
-  

- 
- 
-
diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
new file mode 100644
index 000000000..5ea200721
--- /dev/null
+++ b/templates/webpages/bankaccounts/bank_account_display_form.html
@@ -0,0 +1,71 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+[%- IF params.error %]
+ 
[% params.error %]

+[%- END %]
+
+ 
[% title %]

+
+ 

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+   
[% 'Account number' | $T8 %]
[% 'Bank code' | $T8 %]
[% 'Bank' | $T8 %]
[% 'IBAN' | $T8 %]
[% 'BIC' | $T8 %]
[% 'Chart' | $T8 %]
+      [%- INCLUDE generic/multibox.html
+            name      = 'account.chart_id',
+            DATA      = CHARTS,
+            id_key    = 'id',
+            label_sub = 'chart_label',
+            style     = 'width: 300px',
+      -%]
+     

+  

+
+  

+   
+   
+   
+
+[%- IF account.id %]
+   
+   
+[%- ELSE %]
+   
+[%- END %]
+  

+ 

+
+
+
diff --git a/templates/webpages/bankaccounts/bank_account_display_form_master.html b/templates/webpages/bankaccounts/bank_account_display_form_master.html
deleted file mode 100644
index 5ea200721..000000000
--- a/templates/webpages/bankaccounts/bank_account_display_form_master.html
+++ /dev/null
@@ -1,71 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-[%- IF params.error %]
- 
[% params.error %]

-[%- END %]
-
- 
[% title %]

-
- 

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-   
[% 'Account number' | $T8 %]
[% 'Bank code' | $T8 %]
[% 'Bank' | $T8 %]
[% 'IBAN' | $T8 %]
[% 'BIC' | $T8 %]
[% 'Chart' | $T8 %]
-      [%- INCLUDE generic/multibox.html
-            name      = 'account.chart_id',
-            DATA      = CHARTS,
-            id_key    = 'id',
-            label_sub = 'chart_label',
-            style     = 'width: 300px',
-      -%]
-     

-  

-
-  

-   
-   
-   
-
-[%- IF account.id %]
-   
-   
-[%- ELSE %]
-   
-[%- END %]
-  

- 

-
-
-
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom.html b/templates/webpages/bankaccounts/bank_account_list_bottom.html
new file mode 100644
index 000000000..eeab8cc35
--- /dev/null
+++ b/templates/webpages/bankaccounts/bank_account_list_bottom.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
+ 

+  

+   [% 'New bank account' | $T8 %]

+   
+  

+
+  
+  
+ 

+
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom_master.html b/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
deleted file mode 100644
index eeab8cc35..000000000
--- a/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- 

-  

-   [% 'New bank account' | $T8 %]

-   
-  

-
-  
-  
- 

-
diff --git a/templates/webpages/common/search_history.html b/templates/webpages/common/search_history.html
new file mode 100644
index 000000000..0b2846985
--- /dev/null
+++ b/templates/webpages/common/search_history.html
@@ -0,0 +1,185 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+
+
+

+
+
+
+  
+    
+      
+      
+    
+    
+      
+    
+  
[% 'history search engine' | $T8 %]

+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+          
+            
+            
+          
+        

+              [% 'What do you want to look for?' | $T8 %]:
+            
+              
+            

+             [% 'What's the term you're looking for?' | $T8 %]
+            
+              
+            

+             [% 'Do you want to limit your search?' | $T8 %]
+            
+              
+                
+                  
+                
+                
+                  
+                
+                
+                  
+                
+              

+                    
+                    

+                  

+                    

+                  

+                    

+                  

+              
+            

+              
+              
+            
+            

+      

+

diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
deleted file mode 100644
index 0b2846985..000000000
--- a/templates/webpages/common/search_history_master.html
+++ /dev/null
@@ -1,185 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-
-
-

-
-
-
-  
-    
-      
-      
-    
-    
-      
-    
-  
[% 'history search engine' | $T8 %]

-        
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-          
-            
-            
-          
-        

-              [% 'What do you want to look for?' | $T8 %]:
-            
-              
-            

-             [% 'What's the term you're looking for?' | $T8 %]
-            
-              
-            

-             [% 'Do you want to limit your search?' | $T8 %]
-            
-              
-                
-                  
-                
-                
-                  
-                
-                
-                  
-                
-              

-                    
-                    

-                  

-                    

-                  

-                    

-                  

-              
-            

-              
-              
-            
-            

-      

-

diff --git a/templates/webpages/common/show_history.html b/templates/webpages/common/show_history.html
new file mode 100644
index 000000000..1b9b7e127
--- /dev/null
+++ b/templates/webpages/common/show_history.html
@@ -0,0 +1,123 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% IF SUCCESS %]
+
+[% BLOCK column_header %]
+            
+             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
+               
+             [% ELSE %]
+               
+             [% END %]
+             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
+               
+             [% ELSE %]
+               
+             [% END %]
+            
∧
∧
∨
∨

+[% END %]
+
+
+  
+    
+    
+    
+    
+    
+    
+  
+  
+[% FOREACH row = DATEN %]
+  
+    
+    
+    
+    
+    
+    
+  
+[% END %]
+
+

+      
+        
+          
+          
+        
+      

+            [% 'Zeitpunkt' | $T8 %] 
+          
+           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
+          

+    		
+      
+        
+          
+          
+        
+      

+             [% 'Mitarbeiter' | $T8 %] 
+          
+           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
+          

+    		
+      
+        
+          
+        
+      

+             [% 'Aktion' | $T8 %] 
+          

+    		
+      
+        
+          
+        
+      

+             [% 'Zusatz' | $T8 %] 
+          

+    		
+      
+        
+          
+          
+        
+      

+            [% 'ID-Nummer' | $T8 %] 
+          
+            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
+          

+    		
+      
+        
+          
+          
+        
+      

+            [% 'Belegnummer' | $T8 %] 
+          
+            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
+          

+    

+       [% HTML.escape(row.itime) %] 
+    
+       [% HTML.escape(row.name) %] 
+    
+       [% HTML.escape(row.addition) %] 
+    
+       [% HTML.escape(row.what_done) %] 
+    
+       [% HTML.escape(row.id) %] 
+    
+       [% HTML.escape(row.snumbers) %] 
+    

+[% ELSE %]
+[% 'Keine Suchergebnisse gefunden!' | $T8 %]

+[% END %]
+

+[% IF NONEWWINDOW %]
+
+[% ELSE %]
+
+[% END %]
+

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
deleted file mode 100644
index 1b9b7e127..000000000
--- a/templates/webpages/common/show_history_master.html
+++ /dev/null
@@ -1,123 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-[% IF SUCCESS %]
-
-[% BLOCK column_header %]
-            
-             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               
-             [% ELSE %]
-               
-             [% END %]
-             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               
-             [% ELSE %]
-               
-             [% END %]
-            
∧
∧
∨
∨

-[% END %]
-
-
-  
-    
-    
-    
-    
-    
-    
-  
-  
-[% FOREACH row = DATEN %]
-  
-    
-    
-    
-    
-    
-    
-  
-[% END %]
-
-

-      
-        
-          
-          
-        
-      

-            [% 'Zeitpunkt' | $T8 %] 
-          
-           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
-          

-    		
-      
-        
-          
-          
-        
-      

-             [% 'Mitarbeiter' | $T8 %] 
-          
-           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
-          

-    		
-      
-        
-          
-        
-      

-             [% 'Aktion' | $T8 %] 
-          

-    		
-      
-        
-          
-        
-      

-             [% 'Zusatz' | $T8 %] 
-          

-    		
-      
-        
-          
-          
-        
-      

-            [% 'ID-Nummer' | $T8 %] 
-          
-            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
-          

-    		
-      
-        
-          
-          
-        
-      

-            [% 'Belegnummer' | $T8 %] 
-          
-            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
-          

-    

-       [% HTML.escape(row.itime) %] 
-    
-       [% HTML.escape(row.name) %] 
-    
-       [% HTML.escape(row.addition) %] 
-    
-       [% HTML.escape(row.what_done) %] 
-    
-       [% HTML.escape(row.id) %] 
-    
-       [% HTML.escape(row.snumbers) %] 
-    

-[% ELSE %]
-[% 'Keine Suchergebnisse gefunden!' | $T8 %]

-[% END %]
-

-[% IF NONEWWINDOW %]
-
-[% ELSE %]
-
-[% END %]
-

diff --git a/templates/webpages/common/show_vc_details.html b/templates/webpages/common/show_vc_details.html
new file mode 100644
index 000000000..49363ea01
--- /dev/null
+++ b/templates/webpages/common/show_vc_details.html
@@ -0,0 +1,329 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+[% BLOCK jump_block %]
+ 

+  [% 'Jump to' | $T8 %] [% 'Billing Address' | $T8 %]
+  [%- FOREACH shipto = SHIPTO %]
+   ,
+   
+    [% 'Shipping Address' | $T8 %]
+    "[% HTML.escape(shipto.shiptoname) %]"
+   
+  [%- END %]
+  [%- FOREACH contact = CONTACTS %]
+   ,
+   
+    [% 'Contact Person' | $T8 %]
+    "[% HTML.escape(contact.cp_name) %]"
+   
+  [%- END %]
+ 

+
+ 

+[% END %]
+
+
+
+ 

+  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"
+ 

+
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+ 
[% 'Billing Address' | $T8 %]

+
+ 
+  
+  [% IF is_customer %]
+   
+   
+  [% ELSE %]
+   
+   
+  [% END %]
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  [% IF is_customer %]
+   
+    
+    
+   
+  [% END %]
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+  
+   
+   
+  
+
+ 
[% 'Customer Number' | $T8 %][% HTML.escape(customernumber) %][% 'Vendor Number' | $T8 %][% HTML.escape(vendornumber) %]
[% 'Company Name' | $T8 %][% HTML.escape(name) %]
[% 'Department' | $T8 %][% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]
[% 'Street' | $T8 %][% HTML.escape(street) %]
[% 'Zip, City' | $T8 %][% HTML.escape(zipcode) %] [% HTML.escape(city) %]
[% 'Country' | $T8 %][% HTML.escape(country) %]
[% 'Contact Person' | $T8 %][% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]
[% 'Phone' | $T8 %][% HTML.escape(phone) %]
[% 'Fax' | $T8 %][% HTML.escape(fax) %]
[% 'E-mail' | $T8 %][% HTML.escape(email) %]
[% 'Homepage' | $T8 %][% HTML.escape(homepage) %]
[% 'Credit Limit' | $T8 %][% HTML.escape(creditlimit) %]
[% 'Discount' | $T8 %][% HTML.escape(discount) %]%
[% 'Payment Terms' | $T8 %][% HTML.escape(payment_terms) %]
[% 'Tax Number' | $T8 %][% HTML.escape(taxnumber) %]
[% 'USt-IdNr.' | $T8 %][% HTML.escape(ustid) %]
[% 'KNr. beim Kunden' | $T8 %][% HTML.escape(c_vendor_id) %]
[% 'Account Number' | $T8 %][% HTML.escape(account_number) %]
[% 'Bank Code' | $T8 %][% HTML.escape(bank_code) %]
[% 'Bank' | $T8 %][% HTML.escape(bank) %]
[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %][% HTML.escape(business) %]
[% 'Language' | $T8 %][% HTML.escape(language) %]
[% 'Notes' | $T8 %][% HTML.escape(notes) %]

+
+
+
+
+ [% FOREACH row = SHIPTO %]
+
+  

+
+  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+  
[% 'Shipping Address' | $T8 %] "[% HTML.escape(row.shiptoname) %]"

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+  
[% 'Company Name' | $T8 %][% HTML.escape(row.shiptoname) %]
[% 'Department' | $T8 %][% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]
[% 'Street' | $T8 %][% HTML.escape(row.shiptostreet) %]
[% 'Zip, City' | $T8 %][% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]
[% 'Country' | $T8 %][% HTML.escape(row.shiptocountry) %]
[% 'Contact Person' | $T8 %][% HTML.escape(row.shiptocontact) %]
[% 'Phone' | $T8 %][% HTML.escape(row.shiptophone) %]
[% 'Fax' | $T8 %][% HTML.escape(row.shiptofax) %]
[% 'E-mail' | $T8 %][% HTML.escape(row.shiptoemail) %]

+ [% END %]
+
+
+
+
+
+
+
+
+
+
+ [% FOREACH row = CONTACTS %]
+
+  

+
+  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+  
[% 'Contact Person' | $T8 %] "[% HTML.escape(row.cp_name) %]"

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+  
[% 'Greeting' | $T8 %][% HTML.escape(row.cp_greeting) %]
[% 'Title' | $T8 %][% HTML.escape(row.cp_title) %]
[% 'Given Name' | $T8 %][% HTML.escape(row.cp_givenname) %]
[% 'Name' | $T8 %][% HTML.escape(row.cp_name) %]
[% 'Department' | $T8 %][% HTML.escape(row.cp_abteilung) %]
[% 'Phone1' | $T8 %][% HTML.escape(row.cp_phone1) %]
[% 'Phone2' | $T8 %][% HTML.escape(row.cp_phone2) %]
[% 'Fax' | $T8 %][% HTML.escape(row.cp_fax) %]
[% 'Mobile1' | $T8 %][% HTML.escape(row.cp_mobile1) %]
[% 'Mobile2' | $T8 %][% HTML.escape(row.cp_mobile2) %]
[% 'Sat. Phone' | $T8 %][% HTML.escape(row.cp_satphone) %]
[% 'Sat. Fax' | $T8 %][% HTML.escape(row.cp_satfax) %]
[% 'Project' | $T8 %][% HTML.escape(row.cp_project) %]
[% 'E-mail' | $T8 %][% HTML.escape(row.cp_email) %]
[% 'Private Phone' | $T8 %][% HTML.escape(row.cp_privatphone) %]
[% 'Private E-mail' | $T8 %][% HTML.escape(row.cp_privatemail) %]
[% 'Birthday' | $T8 %][% HTML.escape(row.cp_birthday) %]

+
+ [% END %]
+
+
+
diff --git a/templates/webpages/common/show_vc_details_master.html b/templates/webpages/common/show_vc_details_master.html
deleted file mode 100644
index 49363ea01..000000000
--- a/templates/webpages/common/show_vc_details_master.html
+++ /dev/null
@@ -1,329 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-[% BLOCK jump_block %]
- 

-  [% 'Jump to' | $T8 %] [% 'Billing Address' | $T8 %]
-  [%- FOREACH shipto = SHIPTO %]
-   ,
-   
-    [% 'Shipping Address' | $T8 %]
-    "[% HTML.escape(shipto.shiptoname) %]"
-   
-  [%- END %]
-  [%- FOREACH contact = CONTACTS %]
-   ,
-   
-    [% 'Contact Person' | $T8 %]
-    "[% HTML.escape(contact.cp_name) %]"
-   
-  [%- END %]
- 

-
- 

-[% END %]
-
-
-
- 

-  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"
- 

-
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
- 
[% 'Billing Address' | $T8 %]

-
- 
-  
-  [% IF is_customer %]
-   
-   
-  [% ELSE %]
-   
-   
-  [% END %]
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  [% IF is_customer %]
-   
-    
-    
-   
-  [% END %]
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
-  
-   
-   
-  
-
- 
[% 'Customer Number' | $T8 %][% HTML.escape(customernumber) %][% 'Vendor Number' | $T8 %][% HTML.escape(vendornumber) %]
[% 'Company Name' | $T8 %][% HTML.escape(name) %]
[% 'Department' | $T8 %][% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]
[% 'Street' | $T8 %][% HTML.escape(street) %]
[% 'Zip, City' | $T8 %][% HTML.escape(zipcode) %] [% HTML.escape(city) %]
[% 'Country' | $T8 %][% HTML.escape(country) %]
[% 'Contact Person' | $T8 %][% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]
[% 'Phone' | $T8 %][% HTML.escape(phone) %]
[% 'Fax' | $T8 %][% HTML.escape(fax) %]
[% 'E-mail' | $T8 %][% HTML.escape(email) %]
[% 'Homepage' | $T8 %][% HTML.escape(homepage) %]
[% 'Credit Limit' | $T8 %][% HTML.escape(creditlimit) %]
[% 'Discount' | $T8 %][% HTML.escape(discount) %]%
[% 'Payment Terms' | $T8 %][% HTML.escape(payment_terms) %]
[% 'Tax Number' | $T8 %][% HTML.escape(taxnumber) %]
[% 'USt-IdNr.' | $T8 %][% HTML.escape(ustid) %]
[% 'KNr. beim Kunden' | $T8 %][% HTML.escape(c_vendor_id) %]
[% 'Account Number' | $T8 %][% HTML.escape(account_number) %]
[% 'Bank Code' | $T8 %][% HTML.escape(bank_code) %]
[% 'Bank' | $T8 %][% HTML.escape(bank) %]
[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %][% HTML.escape(business) %]
[% 'Language' | $T8 %][% HTML.escape(language) %]
[% 'Notes' | $T8 %][% HTML.escape(notes) %]

-
-
-
-
- [% FOREACH row = SHIPTO %]
-
-  

-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  
[% 'Shipping Address' | $T8 %] "[% HTML.escape(row.shiptoname) %]"

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-  
[% 'Company Name' | $T8 %][% HTML.escape(row.shiptoname) %]
[% 'Department' | $T8 %][% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]
[% 'Street' | $T8 %][% HTML.escape(row.shiptostreet) %]
[% 'Zip, City' | $T8 %][% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]
[% 'Country' | $T8 %][% HTML.escape(row.shiptocountry) %]
[% 'Contact Person' | $T8 %][% HTML.escape(row.shiptocontact) %]
[% 'Phone' | $T8 %][% HTML.escape(row.shiptophone) %]
[% 'Fax' | $T8 %][% HTML.escape(row.shiptofax) %]
[% 'E-mail' | $T8 %][% HTML.escape(row.shiptoemail) %]

- [% END %]
-
-
-
-
-
-
-
-
-
-
- [% FOREACH row = CONTACTS %]
-
-  

-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  
[% 'Contact Person' | $T8 %] "[% HTML.escape(row.cp_name) %]"

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-  
[% 'Greeting' | $T8 %][% HTML.escape(row.cp_greeting) %]
[% 'Title' | $T8 %][% HTML.escape(row.cp_title) %]
[% 'Given Name' | $T8 %][% HTML.escape(row.cp_givenname) %]
[% 'Name' | $T8 %][% HTML.escape(row.cp_name) %]
[% 'Department' | $T8 %][% HTML.escape(row.cp_abteilung) %]
[% 'Phone1' | $T8 %][% HTML.escape(row.cp_phone1) %]
[% 'Phone2' | $T8 %][% HTML.escape(row.cp_phone2) %]
[% 'Fax' | $T8 %][% HTML.escape(row.cp_fax) %]
[% 'Mobile1' | $T8 %][% HTML.escape(row.cp_mobile1) %]
[% 'Mobile2' | $T8 %][% HTML.escape(row.cp_mobile2) %]
[% 'Sat. Phone' | $T8 %][% HTML.escape(row.cp_satphone) %]
[% 'Sat. Fax' | $T8 %][% HTML.escape(row.cp_satfax) %]
[% 'Project' | $T8 %][% HTML.escape(row.cp_project) %]
[% 'E-mail' | $T8 %][% HTML.escape(row.cp_email) %]
[% 'Private Phone' | $T8 %][% HTML.escape(row.cp_privatphone) %]
[% 'Private E-mail' | $T8 %][% HTML.escape(row.cp_privatemail) %]
[% 'Birthday' | $T8 %][% HTML.escape(row.cp_birthday) %]

-
- [% END %]
-
-
-
diff --git a/templates/webpages/ct/ajax_autocomplete.html b/templates/webpages/ct/ajax_autocomplete.html
new file mode 100644
index 000000000..25ab8c3e6
--- /dev/null
+++ b/templates/webpages/ct/ajax_autocomplete.html
@@ -0,0 +1,6 @@
+[%- USE HTML %]
+[%- FOREACH vc = CT %]
+[%- IF loop.count < limit %]
+[% vc.$column %]
+[%- END %]
+[%- END %]
diff --git a/templates/webpages/ct/ajax_autocomplete_master.html b/templates/webpages/ct/ajax_autocomplete_master.html
deleted file mode 100644
index 25ab8c3e6..000000000
--- a/templates/webpages/ct/ajax_autocomplete_master.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE HTML %]
-[%- FOREACH vc = CT %]
-[%- IF loop.count < limit %]
-[% vc.$column %]
-[%- END %]
-[%- END %]
diff --git a/templates/webpages/ct/form_footer.html b/templates/webpages/ct/form_footer.html
new file mode 100644
index 000000000..0fc528913
--- /dev/null
+++ b/templates/webpages/ct/form_footer.html
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+
+
+
+
+
+
+

+  
+  
+  [%- IF is_customer %]
+  
+  [%- ELSE %]
+  
+  [%- END %]
+  
+  
+  [%- IF is_customer %]
+  
+  [%- ELSE %]
+  
+  [%- END %]
+[%- IF id AND is_orphaned %]
+  
+[%- END %]
+[%- IF id %]
+  
+[%- END %]
+
+  
+
+ 
+
+
diff --git a/templates/webpages/ct/form_footer_master.html b/templates/webpages/ct/form_footer_master.html
deleted file mode 100644
index 0fc528913..000000000
--- a/templates/webpages/ct/form_footer_master.html
+++ /dev/null
@@ -1,52 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-
-
-
-
-
-
-

-  
-  
-  [%- IF is_customer %]
-  
-  [%- ELSE %]
-  
-  [%- END %]
-  
-  
-  [%- IF is_customer %]
-  
-  [%- ELSE %]
-  
-  [%- END %]
-[%- IF id AND is_orphaned %]
-  
-[%- END %]
-[%- IF id %]
-  
-[%- END %]
-
-  
-
- 
-
-
diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
new file mode 100644
index 000000000..71a2a165b
--- /dev/null
+++ b/templates/webpages/ct/form_header.html
@@ -0,0 +1,658 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+
+ 
[% title %]

+
+ 

+
+  
+
+  

+
+   

+
+    
+     
+     [% IF conf_vertreter %]
+      
+       
+       
+      
+      
+       
+       
+      
+     [%- END %]
+     
+      [%- IF is_customer %]
+      
+      
+      [%- ELSE %]
+      
+      
+      [%- END %]
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+    
[% IF is_customer %][% 'Type of Customer' | $T8 %][%- ELSE %][% 'Type of Vendor' | $T8 %][%- END %]
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       
[% 'Representative' | $T8 %]
+        [%- INCLUDE generic/multibox.html
+              name      = 'salesman_id',
+              DATA      = ALL_SALESMAN_CUSTOMERS,
+              id_key    = 'id',
+              label_key = 'name',
+        -%]
+       
[% 'Customer Number' | $T8 %][% 'Vendor Number' | $T8 %]
[% 'Greeting' | $T8 %]
+        
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_company_greeting',
+             DATA       = MB_COMPANY_GREETINGS,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      
[% IF is_customer %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]
[% 'Department' | $T8 %]
+       
+       
+      
[% 'Street' | $T8 %]
[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]
+       
+       
+      
[% 'Country' | $T8 %]
[% 'Contact' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Homepage' | $T8 %]

+
+    
+     
+      
+      
+      
+      
+      
+
+      
+      
+     
+
+     
+      
+      
+      
+      
+      
+      [%- IF is_customer %]
+      
+      
+      [%- ELSE %]
+      
+      
+      [%- END %]
+     
+
+     
+      
+      
+      
+      
+      
+      
+     
+
+     
+      
+      
+      
+      
+     
+
+     [%- IF conf_vertreter %]
+      
+       
+       
+       
+       
+      
+     [%- END %]
+
+     
+      [% UNLESS conf_vertreter %]
+       
+       
+      [%- END %]
+      
+      
+
+      [%- IF is_customer %]
+      
+      
+      [%- END  %]
+     
+
+     
+      
+      
+      
+      
+     
+
+     
+      
+      
+      [%- IF is_customer && !conf_vertreter %]
+      
+      
+      [%- END %]
+     
+    
[% 'Credit Limit' | $T8 %][% 'Payment Terms' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'payment_id',
+             DATA       = payment_terms,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      [% 'Discount' | $T8 %] %
[% 'Tax Number / SSN' | $T8 %][% 'sales tax identification number' | $T8 %][% 'our vendor number at customer' | $T8 %][% 'Customer Number' | $T8 %]
[% 'Account Number' | $T8 %][% 'Bank Code Number' | $T8 %][% 'Bank' | $T8 %]
[% 'IBAN' | $T8 %][% 'BIC' | $T8 %]
[% 'Username' | $T8 %][% 'Password' | $T8 %]
[% IF is_customer %][% 'Type of Customer' | $T8 %][% ELSE %][% 'Type of Vendor' | $T8 %][%- END %]
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       [% 'Language' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'language_id',
+             DATA       = languages,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      [% 'Preisklasse' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'klass',
+             DATA       = all_pricegroup,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'pricegroup',
+       -%]
+      
[% 'Obsolete' | $T8 %][% 'direct debit' | $T8 %]
[% 'Steuersatz' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'taxzone_id',
+             DATA       = ALL_TAXZONES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      [% 'Salesman' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'salesman_id',
+             DATA       = ALL_SALESMEN,
+             show_empty = 1,
+             id_key     = 'id',
+             label_sub  = 'salesman_label',
+       -%]
+      

+
+    
+     
+      
+     
+
+     
+      
+     
+    
[% 'Notes' | $T8 %]

+
+    

+   

+
+   

+
+    
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+     
+     
+      
+     
+    
[% 'Shipping Address' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'shipto_id',
+             id         = 'shipto_id',
+             DATA       = SHIPTO,
+             onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail',enable_delete_shipto,set_gender])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+             label_key  = 'shipto_label',
+       -%]
+      
[% 'Company Name' | $T8 %]
[% 'Abteilung' | $T8 %]
+       
+       
+      
[% 'Street' | $T8 %]
[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]
+       
+       
+      
[% 'Country' | $T8 %]
[% 'Contact' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'E-mail' | $T8 %]
 
 

+
+    
+    

+   

+
+   

+    
+     
+     
+      
+      
+     
+
+    
+     
+     
+    
+    
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     
+      
+     
+
+     
+      
+      
+     
+    
[% 'Ansprechpartner' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'cp_id',
+             id         = 'cp_id',
+             DATA       = CONTACTS,
+             onChange   = "on_contact_changed()",
+             id_key     = 'cp_id',
+             label_sub  = 'contacts_label',
+       -%]
+      
[% 'Gender' | $T8 %]
+      
+     
[% 'Title' | $T8 %]
+        
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_title',
+             id         = 'selected_cp_title',
+             DATA       = MB_TITLES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      
[% 'Department' | $T8 %]
+        
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_abteilung',
+             id         = 'selected_cp_abteilung',
+             DATA       = MB_DEPARTMENT,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      
[% 'Given Name' | $T8 %]
[% 'Name' | $T8 %]
[% 'Phone1' | $T8 %]
[% 'Phone2' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Mobile1' | $T8 %]
[% 'Mobile2' | $T8 %]
[% 'Sat. Phone' | $T8 %]
[% 'Sat. Fax' | $T8 %]
[% 'Project' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Private Phone' | $T8 %]
[% 'Private E-mail' | $T8 %]
[% 'Birthday' | $T8 %]
[% 'Bcc' | $T8 %]

+
+    
+    

+   

+
+   

+    
+     
+      
+      
+     
+
+     
+      
+      
+      
+      
+     
+
+     
+      
+     
+    
[% 'Shipping Address' | $T8 %]
+       [%- INCLUDE generic/multibox.html
+             name       = 'delivery_id',
+             id         = 'delivery_id',
+             DATA       = SHIPTO,
+             onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+       -%]
+      
[% 'From' | $T8 %]
+       
+       
+      [% 'To (time)' | $T8 %]
+       
+       
+      

+       

+       

+      

+
+    

+   

+
+   

+
+    [%- IF NOTES && NOTES.size %]
+    

+     
+      
+       
+       
+       
+       
+       
+       
+       
+      
+
+      [%- FOREACH row = NOTES %]
+      
+       
+       
+       
+       
+       
+       
+       
+       
+      
+      [%- END %]
+
+      
+
+     
[% 'Delete' | $T8 %][% 'Subject' | $T8 %][% 'Created on' | $T8 %][% 'Created by' | $T8 %][% 'Follow-Up Date' | $T8 %][% 'Follow-Up for' | $T8 %][% 'Follow-Up done' | $T8 %]
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %][% END %]

+    

+    [%- END %]
+
+    
[% IF NOTE_id %][% 'Edit note' | $T8 %][% ELSE %][% 'Add note' | $T8 %][% END %]

+
+    
+    
+
+    

+     
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+     
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]
[% 'Follow-Up On' | $T8 %]
+        
+        
+        [% 'for' | $T8 %]
+        
+       
 
+        
+        
+       

+    

+
+    

+   

+
+   [%- IF CUSTOM_VARIABLES.size %]
+   

+
+    

+     
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      
+       
+       
+      
+      [%- END %]
+     
[% HTML.escape(var.description) %][% var.HTML_CODE %]

+    

+
+    

+   

+   [%- END %]
+
+  

+
+  
+  
diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
deleted file mode 100644
index 71a2a165b..000000000
--- a/templates/webpages/ct/form_header_master.html
+++ /dev/null
@@ -1,658 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-
- 
[% title %]

-
- 
-
-  
-
-  

-
-   

-
-    
-     
-     [% IF conf_vertreter %]
-      
-       
-       
-      
-      
-       
-       
-      
-     [%- END %]
-     
-      [%- IF is_customer %]
-      
-      
-      [%- ELSE %]
-      
-      
-      [%- END %]
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-    
[% IF is_customer %][% 'Type of Customer' | $T8 %][%- ELSE %][% 'Type of Vendor' | $T8 %][%- END %]
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       
[% 'Representative' | $T8 %]
-        [%- INCLUDE generic/multibox.html
-              name      = 'salesman_id',
-              DATA      = ALL_SALESMAN_CUSTOMERS,
-              id_key    = 'id',
-              label_key = 'name',
-        -%]
-       
[% 'Customer Number' | $T8 %][% 'Vendor Number' | $T8 %]
[% 'Greeting' | $T8 %]
-        
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_company_greeting',
-             DATA       = MB_COMPANY_GREETINGS,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      
[% IF is_customer %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]
[% 'Department' | $T8 %]
-       
-       
-      
[% 'Street' | $T8 %]
[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]
-       
-       
-      
[% 'Country' | $T8 %]
[% 'Contact' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Homepage' | $T8 %]

-
-    
-     
-      
-      
-      
-      
-      
-
-      
-      
-     
-
-     
-      
-      
-      
-      
-      
-      [%- IF is_customer %]
-      
-      
-      [%- ELSE %]
-      
-      
-      [%- END %]
-     
-
-     
-      
-      
-      
-      
-      
-      
-     
-
-     
-      
-      
-      
-      
-     
-
-     [%- IF conf_vertreter %]
-      
-       
-       
-       
-       
-      
-     [%- END %]
-
-     
-      [% UNLESS conf_vertreter %]
-       
-       
-      [%- END %]
-      
-      
-
-      [%- IF is_customer %]
-      
-      
-      [%- END  %]
-     
-
-     
-      
-      
-      
-      
-     
-
-     
-      
-      
-      [%- IF is_customer && !conf_vertreter %]
-      
-      
-      [%- END %]
-     
-    
[% 'Credit Limit' | $T8 %][% 'Payment Terms' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'payment_id',
-             DATA       = payment_terms,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      [% 'Discount' | $T8 %] %
[% 'Tax Number / SSN' | $T8 %][% 'sales tax identification number' | $T8 %][% 'our vendor number at customer' | $T8 %][% 'Customer Number' | $T8 %]
[% 'Account Number' | $T8 %][% 'Bank Code Number' | $T8 %][% 'Bank' | $T8 %]
[% 'IBAN' | $T8 %][% 'BIC' | $T8 %]
[% 'Username' | $T8 %][% 'Password' | $T8 %]
[% IF is_customer %][% 'Type of Customer' | $T8 %][% ELSE %][% 'Type of Vendor' | $T8 %][%- END %]
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       [% 'Language' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'language_id',
-             DATA       = languages,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      [% 'Preisklasse' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'klass',
-             DATA       = all_pricegroup,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'pricegroup',
-       -%]
-      
[% 'Obsolete' | $T8 %][% 'direct debit' | $T8 %]
[% 'Steuersatz' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'taxzone_id',
-             DATA       = ALL_TAXZONES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      [% 'Salesman' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'salesman_id',
-             DATA       = ALL_SALESMEN,
-             show_empty = 1,
-             id_key     = 'id',
-             label_sub  = 'salesman_label',
-       -%]
-      

-
-    
-     
-      
-     
-
-     
-      
-     
-    
[% 'Notes' | $T8 %]

-
-    

-   

-
-   

-
-    
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-     
-     
-      
-     
-    
[% 'Shipping Address' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'shipto_id',
-             id         = 'shipto_id',
-             DATA       = SHIPTO,
-             onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail',enable_delete_shipto,set_gender])",
-             id_key     = 'shipto_id',
-             label_sub  = 'shipto_label',
-             label_key  = 'shipto_label',
-       -%]
-      
[% 'Company Name' | $T8 %]
[% 'Abteilung' | $T8 %]
-       
-       
-      
[% 'Street' | $T8 %]
[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]
-       
-       
-      
[% 'Country' | $T8 %]
[% 'Contact' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'E-mail' | $T8 %]
 
 

-
-    
-    

-   

-
-   

-    
-     
-     
-      
-      
-     
-
-    
-     
-     
-    
-    
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     
-      
-     
-
-     
-      
-      
-     
-    
[% 'Ansprechpartner' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'cp_id',
-             id         = 'cp_id',
-             DATA       = CONTACTS,
-             onChange   = "on_contact_changed()",
-             id_key     = 'cp_id',
-             label_sub  = 'contacts_label',
-       -%]
-      
[% 'Gender' | $T8 %]
-      
-     
[% 'Title' | $T8 %]
-        
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_title',
-             id         = 'selected_cp_title',
-             DATA       = MB_TITLES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      
[% 'Department' | $T8 %]
-        
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_abteilung',
-             id         = 'selected_cp_abteilung',
-             DATA       = MB_DEPARTMENT,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      
[% 'Given Name' | $T8 %]
[% 'Name' | $T8 %]
[% 'Phone1' | $T8 %]
[% 'Phone2' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Mobile1' | $T8 %]
[% 'Mobile2' | $T8 %]
[% 'Sat. Phone' | $T8 %]
[% 'Sat. Fax' | $T8 %]
[% 'Project' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Private Phone' | $T8 %]
[% 'Private E-mail' | $T8 %]
[% 'Birthday' | $T8 %]
[% 'Bcc' | $T8 %]

-
-    
-    

-   

-
-   

-    
-     
-      
-      
-     
-
-     
-      
-      
-      
-      
-     
-
-     
-      
-     
-    
[% 'Shipping Address' | $T8 %]
-       [%- INCLUDE generic/multibox.html
-             name       = 'delivery_id',
-             id         = 'delivery_id',
-             DATA       = SHIPTO,
-             onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
-             id_key     = 'shipto_id',
-             label_sub  = 'shipto_label',
-       -%]
-      
[% 'From' | $T8 %]
-       
-       
-      [% 'To (time)' | $T8 %]
-       
-       
-      

-       

-       

-      

-
-    

-   

-
-   

-
-    [%- IF NOTES && NOTES.size %]
-    

-     
-      
-       
-       
-       
-       
-       
-       
-       
-      
-
-      [%- FOREACH row = NOTES %]
-      
-       
-       
-       
-       
-       
-       
-       
-       
-      
-      [%- END %]
-
-      
-
-     
[% 'Delete' | $T8 %][% 'Subject' | $T8 %][% 'Created on' | $T8 %][% 'Created by' | $T8 %][% 'Follow-Up Date' | $T8 %][% 'Follow-Up for' | $T8 %][% 'Follow-Up done' | $T8 %]
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %][% END %]

-    

-    [%- END %]
-
-    
[% IF NOTE_id %][% 'Edit note' | $T8 %][% ELSE %][% 'Add note' | $T8 %][% END %]

-
-    
-    
-
-    

-     
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-     
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]
[% 'Follow-Up On' | $T8 %]
-        
-        
-        [% 'for' | $T8 %]
-        
-       
 
-        
-        
-       

-    

-
-    

-   

-
-   [%- IF CUSTOM_VARIABLES.size %]
-   

-
-    

-     
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      
-       
-       
-      
-      [%- END %]
-     
[% HTML.escape(var.description) %][% var.HTML_CODE %]

-    

-
-    

-   

-   [%- END %]
-
-  

-
-  
-  
diff --git a/templates/webpages/ct/get_delivery.html b/templates/webpages/ct/get_delivery.html
new file mode 100644
index 000000000..73d2154ec
--- /dev/null
+++ b/templates/webpages/ct/get_delivery.html
@@ -0,0 +1,41 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+  
+    
-     
-    
-   

+      
+        
+          
+          
+          
+          
+          
+          
+          
+[%- IF is_customer %]
+          
+[%- ELSE %]
+          
+[%- END %]
+        
+[%- FOREACH row = DELIVERY %]
+[%-
+    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
+                             :  ( row.invoice ? 'ir' : 'ap' )
+-%]
+        
+          
+          
+          
+          
+          
+          
+          
+          
+        
+[%- END %]
+
+     
[% 'Shipping Address' | $T8 %][% 'Invoice' | $T8 %][% 'Order' | $T8 %][% 'Invdate' | $T8 %][% 'Description' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %][% 'Sell Price' | $T8 %][% 'Last Cost' | $T8 %]
[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %] [% IF row.id %][% END %][% HTML.escape(row.invnumber)   || ' ' %][% IF row.id %][% END %][% IF row.oe_id %][% END %][% HTML.escape(row.ordnumber)   || ' ' %][% IF row.oe_id %][% END %][% HTML.escape(row.transdate)   || ' ' %][% HTML.escape(row.description) || ' ' %][% HTML.escape(row.qty)         || ' ' %][% HTML.escape(row.unit)        || ' ' %][% LxERP.format_amount(row.sellprice, 2) || ' ' %]

+[%- IF DELIVERY.size == 15 %]
+     
[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]

+[%- END %]
diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
deleted file mode 100644
index 73d2154ec..000000000
--- a/templates/webpages/ct/get_delivery_master.html
+++ /dev/null
@@ -1,41 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-  
-    
+     
+    
+   

-      
-        
-          
-          
-          
-          
-          
-          
-          
-[%- IF is_customer %]
-          
-[%- ELSE %]
-          
-[%- END %]
-        
-[%- FOREACH row = DELIVERY %]
-[%-
-    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
-                             :  ( row.invoice ? 'ir' : 'ap' )
--%]
-        
-          
-          
-          
-          
-          
-          
-          
-          
-        
-[%- END %]
-
-     
[% 'Shipping Address' | $T8 %][% 'Invoice' | $T8 %][% 'Order' | $T8 %][% 'Invdate' | $T8 %][% 'Description' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %][% 'Sell Price' | $T8 %][% 'Last Cost' | $T8 %]
[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %] [% IF row.id %][% END %][% HTML.escape(row.invnumber)   || ' ' %][% IF row.id %][% END %][% IF row.oe_id %][% END %][% HTML.escape(row.ordnumber)   || ' ' %][% IF row.oe_id %][% END %][% HTML.escape(row.transdate)   || ' ' %][% HTML.escape(row.description) || ' ' %][% HTML.escape(row.qty)         || ' ' %][% HTML.escape(row.unit)        || ' ' %][% LxERP.format_amount(row.sellprice, 2) || ' ' %]

-[%- IF DELIVERY.size == 15 %]
-     
[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]

-[%- END %]
diff --git a/templates/webpages/ct/list_names_bottom.html b/templates/webpages/ct/list_names_bottom.html
new file mode 100644
index 000000000..0fd53897e
--- /dev/null
+++ b/templates/webpages/ct/list_names_bottom.html
@@ -0,0 +1,11 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+ 
+
+ [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]

+
+ 
+
+
diff --git a/templates/webpages/ct/list_names_bottom_master.html b/templates/webpages/ct/list_names_bottom_master.html
deleted file mode 100644
index 0fd53897e..000000000
--- a/templates/webpages/ct/list_names_bottom_master.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]

-
- 
- 
-
- [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]

-
- 
-
-

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
new file mode 100644
index 000000000..74697749a
--- /dev/null
+++ b/templates/webpages/ct/search.html
@@ -0,0 +1,166 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+
+  
[% title %]

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+   
+    
+    
+   
+   
+    
+    
+   
+ 
+    
+    
+ 
+   
+    
+    
+   
+   [% IF SHOW_BUSINESS_TYPES %]
+   
+    
+    
+   
+   [% END %]
+
+   [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]
[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]
[% 'Contact' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Contact person (surname)' | $T8 %]
[% 'Billing/shipping address (street)' | $T8 %]
[% 'Billing/shipping address (zipcode)' | $T8 %]
[% 'Billing/shipping address (city)' | $T8 %]
[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]
+     
+    

+      [% 'All' | $T8 %]
+      [% 'Orphaned' | $T8 %]
+    
 [% 'All' | $T8 %]
+      [% 'Obsolete' | $T8 %]
+      [% 'Not obsolete' | $T8 %]
+    
[% 'Include in Report' | $T8 %]
+     
+      
+       
+       
+       
+       
+      
+
+      
+       
+       
+       
+       
+      
+
+      
+       
+       
+       
+       
+      
+
+      
+       
+       
+       
+       
+      
+
+      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+
+     

+        
+        
+       
+        
+        
+       
+        
+        
+       
+        
+        
+       

+        
+        
+       
+        
+        
+       
+        
+        
+       
+        
+        
+       

+        
+        
+       
+        
+        
+       
+        
+        
+       
+        
+        
+      

+        
+        
+       
+        
+        
+       
+        
+        
+       
+       

+    

+
+  
+
+  
+ 

+
+
+
diff --git a/templates/webpages/ct/search_master.html b/templates/webpages/ct/search_master.html
deleted file mode 100644
index 74697749a..000000000
--- a/templates/webpages/ct/search_master.html
+++ /dev/null
@@ -1,166 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-
-  
[% title %]

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-   
-    
-    
-   
-   
-    
-    
-   
- 
-    
-    
- 
-   
-    
-    
-   
-   [% IF SHOW_BUSINESS_TYPES %]
-   
-    
-    
-   
-   [% END %]
-
-   [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]
[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]
[% 'Contact' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Contact person (surname)' | $T8 %]
[% 'Billing/shipping address (street)' | $T8 %]
[% 'Billing/shipping address (zipcode)' | $T8 %]
[% 'Billing/shipping address (city)' | $T8 %]
[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]
-     
-    

-      [% 'All' | $T8 %]
-      [% 'Orphaned' | $T8 %]
-    
 [% 'All' | $T8 %]
-      [% 'Obsolete' | $T8 %]
-      [% 'Not obsolete' | $T8 %]
-    
[% 'Include in Report' | $T8 %]
-     
-      
-       
-       
-       
-       
-      
-
-      
-       
-       
-       
-       
-      
-
-      
-       
-       
-       
-       
-      
-
-      
-       
-       
-       
-       
-      
-
-      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-     

-        
-        
-       
-        
-        
-       
-        
-        
-       
-        
-        
-       

-        
-        
-       
-        
-        
-       
-        
-        
-       
-        
-        
-       

-        
-        
-       
-        
-        
-       
-        
-        
-       
-        
-        
-      

-        
-        
-       
-        
-        
-       
-        
-        
-       
-       

-    

-
-  
-
-  
- 

-
-
-
diff --git a/templates/webpages/datev/net_gross_difference.html b/templates/webpages/datev/net_gross_difference.html
new file mode 100644
index 000000000..98e963e74
--- /dev/null
+++ b/templates/webpages/datev/net_gross_difference.html
@@ -0,0 +1,27 @@
+[% USE HTML %][% USE LxERP %]
+
+

+ Hinweis:
+

+
+

+ 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.
+

+
+

+ 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) %].
+

diff --git a/templates/webpages/datev/net_gross_difference_master.html b/templates/webpages/datev/net_gross_difference_master.html
deleted file mode 100644
index 98e963e74..000000000
--- a/templates/webpages/datev/net_gross_difference_master.html
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-

- Hinweis:
-

-
-

- 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.
-

-
-

- 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) %].
-

diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
new file mode 100644
index 000000000..c4a3dc6a3
--- /dev/null
+++ b/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]

+
+

+
+
[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]

+
[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
+
+
+
+
+
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
deleted file mode 100644
index c4a3dc6a3..000000000
--- a/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]

-
-
-
-
[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]

-
[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
-
-
-
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update.html b/templates/webpages/dbupgrade/SKR04_3804_update.html
new file mode 100644
index 000000000..38500275a
--- /dev/null
+++ b/templates/webpages/dbupgrade/SKR04_3804_update.html
@@ -0,0 +1,13 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]

+
+
+
+
[% 'There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.' | $T8 %]

+
[% 'The account 3804 will not be added automatically.' | $T8 %]

+
[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html

+
+
+
+
+
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_master.html b/templates/webpages/dbupgrade/SKR04_3804_update_master.html
deleted file mode 100644
index 38500275a..000000000
--- a/templates/webpages/dbupgrade/SKR04_3804_update_master.html
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]

-
-
-
-
[% 'There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.' | $T8 %]

-
[% 'The account 3804 will not be added automatically.' | $T8 %]

-
[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html

-
-
-
-
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html
new file mode 100644
index 000000000..68abd3b33
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html
@@ -0,0 +1,145 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 3 of 3: Assemblies' | $T8 %]

+
+
+
+ 
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 
[% 'Existing Buchungsgruppen' | $T8 %]

+
+ 

+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  

+  
    
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    
  • 
+     [% HTML.escape(row.description) %]:
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+    
    • 
+   [% END %]
+  

+ 

+
+ [% FOREACH row = LIST %]
+  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

+
+  
+   
+    
+    
+   
+
+   [% IF row.eur %]
+    
+    [% ELSE %]
+    
+     
+     
+    
+   [% END %]
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
+      
+     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
+     
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    

+
+  [% IF loop.last %]
+   
+  [% END %]
+
+  

+ [% END %]
+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html
new file mode 100644
index 000000000..226d64558
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+
[% 'Step 3 of 3: Assemblies' | $T8 %]

+
+
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
deleted file mode 100644
index 226d64558..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 3 of 3: Assemblies' | $T8 %]

-
-
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
deleted file mode 100644
index 68abd3b33..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
+++ /dev/null
@@ -1,145 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 3 of 3: Assemblies' | $T8 %]

-
-

-
- 
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 
[% 'Existing Buchungsgruppen' | $T8 %]

-
- 

-  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
-  

-  
    
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    
  • 
-     [% HTML.escape(row.description) %]:
-     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    
    • 
-   [% END %]
-  

- 

-
- [% FOREACH row = LIST %]
-  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

-
-  
-   
-    
-    
-   
-
-   [% IF row.eur %]
-    
-    [% ELSE %]
-    
-     
-     
-    
-   [% END %]
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
-      
-     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
-     
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    

-
-  [% IF loop.last %]
-   
-  [% END %]
-
-  

- [% END %]
-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer.html b/templates/webpages/dbupgrade/buchungsgruppen_footer.html
new file mode 100644
index 000000000..0e5f94f43
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_footer.html
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+
[% 'Update complete' | $T8 %]

+
+
[% 'The database upgrade for the introduction of Buchungsgruppen is now complete.' | $T8 %]

+
+

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
deleted file mode 100644
index 0e5f94f43..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE T8 %]
-
[% 'Update complete' | $T8 %]

-
-
[% 'The database upgrade for the introduction of Buchungsgruppen is now complete.' | $T8 %]

-
-

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header.html b/templates/webpages/dbupgrade/buchungsgruppen_header.html
new file mode 100644
index 000000000..5e962c99d
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_header.html
@@ -0,0 +1,19 @@
+[%- USE T8 %]
+

+
+
[% 'Introduction of Buchungsgruppen' | $T8 %]

+
+

+ [%- 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
+ [%- 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
+ [%- 'There are four tax zones.' | $T8 %]
+ [%- 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
+ [%- 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
+ [%- 'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
+

+
+

+ [% 'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' | $T8 %]
+ [% 'It is possible to do this automatically for some Buchungsgruppen, but not for all.' | $T8 %]
+ [% 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' | $T8 %]
+

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_master.html b/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
deleted file mode 100644
index 5e962c99d..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
+++ /dev/null
@@ -1,19 +0,0 @@
-[%- USE T8 %]
-

-
-
[% 'Introduction of Buchungsgruppen' | $T8 %]

-
-

- [%- 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
- [%- 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
- [%- 'There are four tax zones.' | $T8 %]
- [%- 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
- [%- 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
- [%- 'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
-

-
-

- [% 'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' | $T8 %]
- [% 'It is possible to do this automatically for some Buchungsgruppen, but not for all.' | $T8 %]
- [% 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' | $T8 %]
-

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts.html b/templates/webpages/dbupgrade/buchungsgruppen_parts.html
new file mode 100644
index 000000000..36ffd37bd
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts.html
@@ -0,0 +1,143 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 1 of 3: Parts' | $T8 %]

+
+

+
+ 
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 
[% 'Existing Buchungsgruppen' | $T8 %]

+
+ 

+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  

+  
    
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    
  • 
+     [% HTML.escape(row.description) %]:
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+    
    • 
+   [% END %]
+  

+ 

+
+ [% FOREACH row = LIST %]
+  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

+
+  
+   
+    
+    
+   
+
+   [% IF row.eur %]
+    
+    [% ELSE %]
+    
+     
+     
+    
+   [% END %]
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
+      
+      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
+     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
+     
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    
[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:
+     
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
+    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    

+
+  [% IF loop.last %]
+   
+  [% END %]
+
+  

+ [% END %]
+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done.html
new file mode 100644
index 000000000..d93cb064e
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_done.html
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+
[% 'Step 1 of 3: Parts' | $T8 %]

+
+
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
deleted file mode 100644
index d93cb064e..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 1 of 3: Parts' | $T8 %]

-
-
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
deleted file mode 100644
index 36ffd37bd..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
+++ /dev/null
@@ -1,143 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 1 of 3: Parts' | $T8 %]

-
-

-
- 
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 
[% 'Existing Buchungsgruppen' | $T8 %]

-
- 

-  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
-  

-  
    
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    
  • 
-     [% HTML.escape(row.description) %]:
-     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    
    • 
-   [% END %]
-  

- 

-
- [% FOREACH row = LIST %]
-  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

-
-  
-   
-    
-    
-   
-
-   [% IF row.eur %]
-    
-    [% ELSE %]
-    
-     
-     
-    
-   [% END %]
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
-      
-      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
-     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
-     
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    
[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:
-     
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    

-
-  [% IF loop.last %]
-   
-  [% END %]
-
-  

- [% END %]
-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services.html b/templates/webpages/dbupgrade/buchungsgruppen_services.html
new file mode 100644
index 000000000..dd060bfc8
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services.html
@@ -0,0 +1,144 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 2 of 3: Services' | $T8 %]

+
+

+
+ 
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 
[% 'Existing Buchungsgruppen' | $T8 %]

+
+ 

+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  

+  
    
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    
  • 
+     [% HTML.escape(row.description) %]:
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+    
    • 
+   [% END %]
+  

+ 

+
+ [% FOREACH row = LIST %]
+  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

+
+  
+   
+    
+    
+   
+
+   [% IF row.eur %]
+    
+    [% ELSE %]
+    
+     
+     
+    
+   [% END %]
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
+      
+     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
+     
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    
[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:
+     
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
+    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
+     
+    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
+     
+    

+
+  [% IF loop.last %]
+   
+  [% END %]
+
+  

+ [% END %]
+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done.html
new file mode 100644
index 000000000..a3d4f4fc6
--- /dev/null
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_done.html
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+
[% 'Step 2 of 3: Services' | $T8 %]

+
+
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
deleted file mode 100644
index a3d4f4fc6..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 2 of 3: Services' | $T8 %]

-
-
[% 'There is nothing to do in this step.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
deleted file mode 100644
index dd060bfc8..000000000
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
+++ /dev/null
@@ -1,144 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 2 of 3: Services' | $T8 %]

-
-

-
- 
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 
[% 'Existing Buchungsgruppen' | $T8 %]

-
- 

-  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
-  

-  
    
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    
  • 
-     [% HTML.escape(row.description) %]:
-     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
-     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    
    • 
-   [% END %]
-  

- 

-
- [% FOREACH row = LIST %]
-  
[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]

-
-  
-   
-    
-    
-   
-
-   [% IF row.eur %]
-    
-    [% ELSE %]
-    
-     
-     
-    
-   [% END %]
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Description' | $T8 %]:
[% 'Inventory' | $T8 %]:
-      
-     
[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:
-     
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    
[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:
-     
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    
[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:
-     
-    
[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    
[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:
-     
-    

-
-  [% IF loop.last %]
-   
-  [% END %]
-
-  

- [% END %]
-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/coa_guess.html b/templates/webpages/dbupgrade/coa_guess.html
new file mode 100644
index 000000000..cec2c574c
--- /dev/null
+++ b/templates/webpages/dbupgrade/coa_guess.html
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Select the chart of accounts in use' | $T8 %]

+
+

+
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 

+  [% 'Please select the chart of accounts this installation is using from the list below.' | $T8 %]
+ 

+
+ 

+  [% 'Chart of accounts' | $T8 %]:
+  
+ 

+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html
deleted file mode 100644
index cec2c574c..000000000
--- a/templates/webpages/dbupgrade/coa_guess_master.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Select the chart of accounts in use' | $T8 %]

-
-

-
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 

-  [% 'Please select the chart of accounts this installation is using from the list below.' | $T8 %]
- 

-
- 

-  [% 'Chart of accounts' | $T8 %]:
-  
- 

-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form.html b/templates/webpages/dbupgrade/cp_greeting_update_form.html
new file mode 100644
index 000000000..b4cb3345b
--- /dev/null
+++ b/templates/webpages/dbupgrade/cp_greeting_update_form.html
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'cp_greeting to cp_gender migration' | $T8 %]

+
+
+

+

+
 The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.

+
+
During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.

+
+During the conversion process:

+1. All contact persons will have their gender set to "m" (male) as a default

+2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)

+
+
The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:

+[% gender_table %]
+
+
+
Please enter your desired default greeting for men and women. To change the
+default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
+

+
+

+Greeting for men: [% default_greeting_text_male %] 

+Greeting for women: [% default_greeting_text_female %] 

+

+
+


+The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
+

+[% title_table %]
+
+ 
+
+
+

+
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form_master.html b/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
deleted file mode 100644
index b4cb3345b..000000000
--- a/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'cp_greeting to cp_gender migration' | $T8 %]

-
-
-

-

-
 The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.

-
-
During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.

-
-During the conversion process:

-1. All contact persons will have their gender set to "m" (male) as a default

-2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)

-
-
The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:

-[% gender_table %]
-
-
-
Please enter your desired default greeting for men and women. To change the
-default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
-

-
-

-Greeting for men: [% default_greeting_text_male %] 

-Greeting for women: [% default_greeting_text_female %] 

-

-
-


-The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
-

-[% title_table %]
-
- 
-
-
-

-
diff --git a/templates/webpages/dbupgrade/error.html b/templates/webpages/dbupgrade/error.html
new file mode 100644
index 000000000..4bcd9b0ac
--- /dev/null
+++ b/templates/webpages/dbupgrade/error.html
@@ -0,0 +1,9 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
[% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
+ 

+ [% error %]
+ 

+ [% 'All changes in that file have been reverted.' | $T8 %]
+

diff --git a/templates/webpages/dbupgrade/error_master.html b/templates/webpages/dbupgrade/error_master.html
deleted file mode 100644
index 4bcd9b0ac..000000000
--- a/templates/webpages/dbupgrade/error_master.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
[% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
- 

- [% error %]
- 

- [% 'All changes in that file have been reverted.' | $T8 %]
-

diff --git a/templates/webpages/dbupgrade/footer.html b/templates/webpages/dbupgrade/footer.html
new file mode 100644
index 000000000..e4c312ab4
--- /dev/null
+++ b/templates/webpages/dbupgrade/footer.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
[% '...done' | $T8 %]

+
+

+
+ 
+
+ 

+

+
+
+
diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html
deleted file mode 100644
index e4c312ab4..000000000
--- a/templates/webpages/dbupgrade/footer_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% '...done' | $T8 %]

-
-

-
- 
-
- 

-

-
-
-
diff --git a/templates/webpages/dbupgrade/header.html b/templates/webpages/dbupgrade/header.html
new file mode 100644
index 000000000..09d840b6e
--- /dev/null
+++ b/templates/webpages/dbupgrade/header.html
@@ -0,0 +1,8 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+  
+   
+  
+ 
[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])

diff --git a/templates/webpages/dbupgrade/header_master.html b/templates/webpages/dbupgrade/header_master.html
deleted file mode 100644
index 09d840b6e..000000000
--- a/templates/webpages/dbupgrade/header_master.html
+++ /dev/null
@@ -1,8 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-  
-   
-  
- 
[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])

diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html
new file mode 100644
index 000000000..0a31cbc3e
--- /dev/null
+++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]
[% 'Unknown chart of accounts' | $T8 %]

+
+

+
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 

+  [% 'Note' | $T8 %]:
+  [% LxERP.t8('This installation uses an unknown chart of accounts ("#1"). This database upgrade cannot create standard buchungsgruppen automatically.', coa) | html %]
+ 

+
+ 

+
+

+
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
deleted file mode 100644
index 0a31cbc3e..000000000
--- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-[% USE HTML %]
[% 'Unknown chart of accounts' | $T8 %]

-
-

-
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 

-  [% 'Note' | $T8 %]:
-  [% LxERP.t8('This installation uses an unknown chart of accounts ("#1"). This database upgrade cannot create standard buchungsgruppen automatically.', coa) | html %]
- 

-
- 

-
-

-
diff --git a/templates/webpages/dbupgrade/units_error.html b/templates/webpages/dbupgrade/units_error.html
new file mode 100644
index 000000000..d7019cb7d
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_error.html
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Error' | $T8 %]: [% message %]

+
+

+
+

diff --git a/templates/webpages/dbupgrade/units_error_master.html b/templates/webpages/dbupgrade/units_error_master.html
deleted file mode 100644
index d7019cb7d..000000000
--- a/templates/webpages/dbupgrade/units_error_master.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Error' | $T8 %]: [% message %]

-
-

-
-

diff --git a/templates/webpages/dbupgrade/units_header.html b/templates/webpages/dbupgrade/units_header.html
new file mode 100644
index 000000000..ef977a15f
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_header.html
@@ -0,0 +1,17 @@
+[%- USE T8 %]
+

+
+
[% 'Introduction of units' | $T8 %]

+
+

+ [% 'Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' | $T8 %]
+ [% 'In Lx-Office 2.4.0 the administrator has to enter a list of units in the administrative section.' | $T8 %]
+ [% 'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' | $T8 %]
+

+
+

+ [% 'This upgrade script tries to map all existing units in the database to the newly created units.' | $T8 %]
+ [% 'It is possible to do this automatically for some units, but for others the user has to chose the new unit.' | $T8 %]
+ [% 'You cannot continue until all unknown units have been mapped to known ones.' | $T8 %]
+ [% 'You can also create new units now.' | $T8 %]
+

diff --git a/templates/webpages/dbupgrade/units_header_master.html b/templates/webpages/dbupgrade/units_header_master.html
deleted file mode 100644
index ef977a15f..000000000
--- a/templates/webpages/dbupgrade/units_header_master.html
+++ /dev/null
@@ -1,17 +0,0 @@
-[%- USE T8 %]
-

-
-
[% 'Introduction of units' | $T8 %]

-
-

- [% 'Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' | $T8 %]
- [% 'In Lx-Office 2.4.0 the administrator has to enter a list of units in the administrative section.' | $T8 %]
- [% 'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' | $T8 %]
-

-
-

- [% 'This upgrade script tries to map all existing units in the database to the newly created units.' | $T8 %]
- [% 'It is possible to do this automatically for some units, but for others the user has to chose the new unit.' | $T8 %]
- [% 'You cannot continue until all unknown units have been mapped to known ones.' | $T8 %]
- [% 'You can also create new units now.' | $T8 %]
-

diff --git a/templates/webpages/dbupgrade/units_parts.html b/templates/webpages/dbupgrade/units_parts.html
new file mode 100644
index 000000000..99cfec132
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_parts.html
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 1 of 3: Parts' | $T8 %]

+
+

+
+ 
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 
[% 'Add unit' | $T8 %]

+
+ 

+  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the "smaller" one. A factor may not be less than 1. Therefore you may define "kg" with the base unit "g" and a factor of "1", but not the other way round.' | $T8 %]
+ 

+
+ 

+  [% 'The following units exist already:' | $T8 %]
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
+ 

+
+ 

+
+ 
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+ 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
+    
+   
[% 'Factor' | $T8 %]

+
+ 
+
+ 

+
+ 
[% 'Assign new units' | $T8 %]

+
+ 

+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
+ 

+
+ 
+  
+   
+   
+  
+
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   
+    
+    
+    [% IF loop.last %][% END %]
+  [% END %]
+ 
[% 'Current unit' | $T8 %][% 'New unit' | $T8 %]

+     [% HTML.escape(row.name) %]
+     
+    
+     
+    

+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/units_parts_done.html b/templates/webpages/dbupgrade/units_parts_done.html
new file mode 100644
index 000000000..fcbf90609
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_parts_done.html
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+
[% 'Step 1 of 3: Parts' | $T8 %]

+
+
[% 'No unknown units where found.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/units_parts_done_master.html b/templates/webpages/dbupgrade/units_parts_done_master.html
deleted file mode 100644
index fcbf90609..000000000
--- a/templates/webpages/dbupgrade/units_parts_done_master.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 1 of 3: Parts' | $T8 %]

-
-
[% 'No unknown units where found.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html
deleted file mode 100644
index 99cfec132..000000000
--- a/templates/webpages/dbupgrade/units_parts_master.html
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 1 of 3: Parts' | $T8 %]

-
-

-
- 
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 
[% 'Add unit' | $T8 %]

-
- 

-  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the "smaller" one. A factor may not be less than 1. Therefore you may define "kg" with the base unit "g" and a factor of "1", but not the other way round.' | $T8 %]
- 

-
- 

-  [% 'The following units exist already:' | $T8 %]
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- 

-
- 

-
- 
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
- 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
-    
-   
[% 'Factor' | $T8 %]

-
- 
-
- 

-
- 
[% 'Assign new units' | $T8 %]

-
- 

-  [% 'The following units are unknown.' | $T8 %]
-  [% 'You have to chose which unit to save for each of them.' | $T8 %]
- 

-
- 
-  
-   
-   
-  
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   
-    
-    
-    [% IF loop.last %][% END %]
-  [% END %]
- 
[% 'Current unit' | $T8 %][% 'New unit' | $T8 %]

-     [% HTML.escape(row.name) %]
-     
-    
-     
-    

-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/units_services.html b/templates/webpages/dbupgrade/units_services.html
new file mode 100644
index 000000000..26b60e894
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_services.html
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 2 of 3: Services' | $T8 %]

+
+

+
+ 
+ 
+ 
+
+ [% IF saved_message %]
+  
[% saved_message %]

+ [% END %]
+
+ 
[% 'Add unit' | $T8 %]

+
+ 

+  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the "smaller" one. A factor may not be less than 1. Therefore you may define "kg" with the base unit "g" and a factor of "1", but not the other way round.' | $T8 %]
+ 

+
+ 

+  [% 'The following units exist already:' | $T8 %]
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
+ 

+
+ 

+
+ 
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+ 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
+    
+   
[% 'Factor' | $T8 %]

+
+ 
+
+ 

+
+ 
[% 'Assign new units' | $T8 %]

+
+ 

+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
+ 

+
+ 
+  
+   
+   
+  
+
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   
+    
+    
+    [% IF loop.last %][% END %]
+  [% END %]
+ 
[% 'Current unit' | $T8 %][% 'New unit' | $T8 %]

+     [% HTML.escape(row.name) %]
+     
+    
+     
+    

+
+ 
+
+

+
diff --git a/templates/webpages/dbupgrade/units_services_done.html b/templates/webpages/dbupgrade/units_services_done.html
new file mode 100644
index 000000000..7de3335f3
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_services_done.html
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+
[% 'Step 2 of 3: Services' | $T8 %]

+
+
[% 'No unknown units where found.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/units_services_done_master.html b/templates/webpages/dbupgrade/units_services_done_master.html
deleted file mode 100644
index 7de3335f3..000000000
--- a/templates/webpages/dbupgrade/units_services_done_master.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 2 of 3: Services' | $T8 %]

-
-
[% 'No unknown units where found.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html
deleted file mode 100644
index 26b60e894..000000000
--- a/templates/webpages/dbupgrade/units_services_master.html
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 2 of 3: Services' | $T8 %]

-
-

-
- 
- 
- 
-
- [% IF saved_message %]
-  
[% saved_message %]

- [% END %]
-
- 
[% 'Add unit' | $T8 %]

-
- 

-  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the "smaller" one. A factor may not be less than 1. Therefore you may define "kg" with the base unit "g" and a factor of "1", but not the other way round.' | $T8 %]
- 

-
- 

-  [% 'The following units exist already:' | $T8 %]
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- 

-
- 

-
- 
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
- 
[% 'Unit' | $T8 %]
[% 'Base unit' | $T8 %]
-    
-   
[% 'Factor' | $T8 %]

-
- 
-
- 

-
- 
[% 'Assign new units' | $T8 %]

-
- 

-  [% 'The following units are unknown.' | $T8 %]
-  [% 'You have to chose which unit to save for each of them.' | $T8 %]
- 

-
- 
-  
-   
-   
-  
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   
-    
-    
-    [% IF loop.last %][% END %]
-  [% END %]
- 
[% 'Current unit' | $T8 %][% 'New unit' | $T8 %]

-     [% HTML.escape(row.name) %]
-     
-    
-     
-    

-
- 
-
-

-
diff --git a/templates/webpages/dbupgrade/units_set_default.html b/templates/webpages/dbupgrade/units_set_default.html
new file mode 100644
index 000000000..285f11bc7
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_set_default.html
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Step 3 of 3: Default units' | $T8 %]

+
+

+
+ 
+ 
+ 
+
+ 

+  [% 'There are still entries in the database for which no unit has been assigned.' | $T8 %]
+  [% 'You have to chose a dimension unit and a service unit which will then be assigned to those entries.' | $T8 %]
+ 

+
+ 
+  
+   
+   
+  
+  
+
+   
+   
+  
+ 
[% 'Dimension unit' | $T8 %]:
+    
+   
[% 'Service unit' | $T8 %]:
+    
+   

+
+ 

+
+

diff --git a/templates/webpages/dbupgrade/units_set_default_done.html b/templates/webpages/dbupgrade/units_set_default_done.html
new file mode 100644
index 000000000..4dbf5c2c2
--- /dev/null
+++ b/templates/webpages/dbupgrade/units_set_default_done.html
@@ -0,0 +1,8 @@
+[%- USE T8 %]
+
[% 'Step 3 of 3: Default units' | $T8 %]

+
+
[% 'No entries were found which had no unit assigned to them.' | $T8 %]

+
+
[% 'The database upgrade for the introduction of units is now complete.' | $T8 %]

+
+

diff --git a/templates/webpages/dbupgrade/units_set_default_done_master.html b/templates/webpages/dbupgrade/units_set_default_done_master.html
deleted file mode 100644
index 4dbf5c2c2..000000000
--- a/templates/webpages/dbupgrade/units_set_default_done_master.html
+++ /dev/null
@@ -1,8 +0,0 @@
-[%- USE T8 %]
-
[% 'Step 3 of 3: Default units' | $T8 %]

-
-
[% 'No entries were found which had no unit assigned to them.' | $T8 %]

-
-
[% 'The database upgrade for the introduction of units is now complete.' | $T8 %]

-
-

diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html
deleted file mode 100644
index 285f11bc7..000000000
--- a/templates/webpages/dbupgrade/units_set_default_master.html
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Step 3 of 3: Default units' | $T8 %]

-
-

-
- 
- 
- 
-
- 

-  [% 'There are still entries in the database for which no unit has been assigned.' | $T8 %]
-  [% 'You have to chose a dimension unit and a service unit which will then be assigned to those entries.' | $T8 %]
- 

-
- 
-  
-   
-   
-  
-  
-
-   
-   
-  
- 
[% 'Dimension unit' | $T8 %]:
-    
-   
[% 'Service unit' | $T8 %]:
-    
-   

-
- 

-
-

diff --git a/templates/webpages/dbupgrade/update_templates_warnings.html b/templates/webpages/dbupgrade/update_templates_warnings.html
new file mode 100644
index 000000000..81bf7b804
--- /dev/null
+++ b/templates/webpages/dbupgrade/update_templates_warnings.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
[% 'Warnings during template upgrade' | $T8 %]

+
+
[% 'The following warnings occured during an upgrade to the document templates:' | $T8 %]

+
+

+ 
    
+  [% FOREACH row = WARNINGS %]
+   
  • [% row.message %]
    • 
+  [% END %]
+ 

+

diff --git a/templates/webpages/dbupgrade/update_templates_warnings_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html
deleted file mode 100644
index 81bf7b804..000000000
--- a/templates/webpages/dbupgrade/update_templates_warnings_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
[% 'Warnings during template upgrade' | $T8 %]

-
-
[% 'The following warnings occured during an upgrade to the document templates:' | $T8 %]

-
-

- 
    
-  [% FOREACH row = WARNINGS %]
-   
  • [% row.message %]
    • 
-  [% END %]
- 

-

diff --git a/templates/webpages/dbupgrade/upgrade_message2.html b/templates/webpages/dbupgrade/upgrade_message2.html
new file mode 100644
index 000000000..f7047102d
--- /dev/null
+++ b/templates/webpages/dbupgrade/upgrade_message2.html
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]
    
+ 
  • [% LxERP.t8('Applying #1:', file) | html %] [% description %]
    • 
+

+
diff --git a/templates/webpages/dbupgrade/upgrade_message2_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html
deleted file mode 100644
index f7047102d..000000000
--- a/templates/webpages/dbupgrade/upgrade_message2_master.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-[% USE HTML %]
    
- 
  • [% LxERP.t8('Applying #1:', file) | html %] [% description %]
    • 
-

-
diff --git a/templates/webpages/dbupgrade/warehouse_form.html b/templates/webpages/dbupgrade/warehouse_form.html
new file mode 100644
index 000000000..5edff88f7
--- /dev/null
+++ b/templates/webpages/dbupgrade/warehouse_form.html
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]
+
[% 'Warehouse Migration' | $T8 %]

+
+

+ 

+  [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
+  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
+  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
+ 

+
+ 
[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]

+
+  
+  
+
+ 
[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]

+ 
+
+ 
[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]

+
+  
+
+ 

+

diff --git a/templates/webpages/dbupgrade/warehouse_form_master.html b/templates/webpages/dbupgrade/warehouse_form_master.html
deleted file mode 100644
index 5edff88f7..000000000
--- a/templates/webpages/dbupgrade/warehouse_form_master.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
[% 'Warehouse Migration' | $T8 %]

-
-

- 

-  [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
-  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
-  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
- 

-
- 
[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]

-
-  
-  
-
- 
[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]

- 
-
- 
[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]

-
-  
-
- 

-

diff --git a/templates/webpages/dbupgrade/warning.html b/templates/webpages/dbupgrade/warning.html
new file mode 100644
index 000000000..6fd0d5e1d
--- /dev/null
+++ b/templates/webpages/dbupgrade/warning.html
@@ -0,0 +1,13 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+

+
+ 
+
+ 

+  [% LxERP.t8('Lx-Office is about to update the database #1. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
+ 

+
+ 
+

diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
deleted file mode 100644
index 6fd0d5e1d..000000000
--- a/templates/webpages/dbupgrade/warning_master.html
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-

-
- 
-
- 

-  [% LxERP.t8('Lx-Office is about to update the database #1. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
- 

-
- 
-

diff --git a/templates/webpages/do/delete.html b/templates/webpages/do/delete.html
new file mode 100644
index 000000000..9cd35923c
--- /dev/null
+++ b/templates/webpages/do/delete.html
@@ -0,0 +1,23 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ 
[% 'Delete delivery order' | $T8 %]

+
+ 

+
+  
[% 'Confirm' | $T8 %]

+
+  
[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]

+
+  [%- FOREACH row = VARIABLES %]
+  
+  [%- END %]
+
+  
+  
+  
+  
+ 

+
+
+
diff --git a/templates/webpages/do/delete_master.html b/templates/webpages/do/delete_master.html
deleted file mode 100644
index 9cd35923c..000000000
--- a/templates/webpages/do/delete_master.html
+++ /dev/null
@@ -1,23 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- 
[% 'Delete delivery order' | $T8 %]

-
- 

-
-  
[% 'Confirm' | $T8 %]

-
-  
[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]

-
-  [%- FOREACH row = VARIABLES %]
-  
-  [%- END %]
-
-  
-  
-  
-  
- 

-
-
-
diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html
new file mode 100644
index 000000000..b81ce8cfe
--- /dev/null
+++ b/templates/webpages/do/form_footer.html
@@ -0,0 +1,101 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+
+
+
+ [%- IF delivered %]
+ [%- SET RO = ' readonly' %]
+ [%- END %]
+
+    

+      
+       
+        
+        
+       
+
+       
+        
+        
+       
+      
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]

+
+     

+  

+
+  

+
+  [%- IF conf_webdav %]
+  
[% 'Documents in the WebDAV repository' | $T8 %]

+
+  

+   
+    
+     
+     
+    
+
+    [%- FOREACH file = WEBDAV %]
+    
+     
+     
+    
+    [%- END %]
+
+   
[% 'File name' | $T8 %][% 'WebDAV link' | $T8 %]
[% HTML.escape(file.name) %][% HTML.escape(file.type) %]

+  

+
+  

+  [%- END %]
+
+  
[% PRINT_OPTIONS %]

+
+  

+   [% 'Edit the Delivery Order' | $T8 %]

+   
+   
+   [%- UNLESS delivered %]
+   [%- IF vc == 'customer' %]
+   
+   [%- END %]
+   [%- END %]
+   
+   
+   [%- UNLESS delivered %]
+   
+   [%- IF vc == 'customer' %]
+   
+   [%- ELSE %]
+   
+   [%- END %]
+   [%- END %]
+   [%- IF id %]
+   [%- UNLESS closed %]
+   
+   [%- END %]
+   
+   [%- END %]
+  

+
+  [%- IF id %]
+  

+   [% 'Workflow Delivery Order' | $T8 %]

+   
+   [% UNLESS delivered %]
+   
+   [% END %]
+   
+  

+  [%- END %]
+
+  
+  
+
+ 
+
+
+
diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
deleted file mode 100644
index b81ce8cfe..000000000
--- a/templates/webpages/do/form_footer_master.html
+++ /dev/null
@@ -1,101 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-
-
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
-    

-      
-       
-        
-        
-       
-
-       
-        
-        
-       
-      
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]

-
-     

-  

-
-  

-
-  [%- IF conf_webdav %]
-  
[% 'Documents in the WebDAV repository' | $T8 %]

-
-  

-   
-    
-     
-     
-    
-
-    [%- FOREACH file = WEBDAV %]
-    
-     
-     
-    
-    [%- END %]
-
-   
[% 'File name' | $T8 %][% 'WebDAV link' | $T8 %]
[% HTML.escape(file.name) %][% HTML.escape(file.type) %]

-  

-
-  

-  [%- END %]
-
-  
[% PRINT_OPTIONS %]

-
-  

-   [% 'Edit the Delivery Order' | $T8 %]

-   
-   
-   [%- UNLESS delivered %]
-   [%- IF vc == 'customer' %]
-   
-   [%- END %]
-   [%- END %]
-   
-   
-   [%- UNLESS delivered %]
-   
-   [%- IF vc == 'customer' %]
-   
-   [%- ELSE %]
-   
-   [%- END %]
-   [%- END %]
-   [%- IF id %]
-   [%- UNLESS closed %]
-   
-   [%- END %]
-   
-   [%- END %]
-  

-
-  [%- IF id %]
-  

-   [% 'Workflow Delivery Order' | $T8 %]

-   
-   [% UNLESS delivered %]
-   
-   [% END %]
-   
-  

-  [%- END %]
-
-  
-  
-
- 
-
-
-
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
new file mode 100644
index 000000000..2f98575f0
--- /dev/null
+++ b/templates/webpages/do/form_header.html
@@ -0,0 +1,356 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+ 
+
+ [%- IF vc == 'customer' %]
+ [%- SET vc = 'customer' %]
+ [%- SET the_vc_id = customer_id %]
+ [%- SET the_vc = customer %]
+ [%- SET the_oldvc = oldcustomer %]
+ [%- SET is_customer = '1' %]
+ [%- ELSE %]
+ [%- SET vc = 'vendor' %]
+ [%- SET the_vc_id = vendor_id %]
+ [%- SET the_vc = vendor %]
+ [%- SET the_oldvc = oldvendor %]
+ [%- SET is_customer = '0' %]
+ [%- END %]
+ [%- IF delivered %]
+ [%- SET RO = ' readonly' %]
+ [%- SET DISABLED = ' disabled' %]
+ [%- END %]
+
+ 
[% title %]

+
+ [%- IF ERRORS && ERRORS.size %]
+ 
[% ERRORS.join('
') %]

+ [%- END %]
+
+ 

+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  

+   
+    
+     
+
+     
+    
+   

+      
+       
+        
+        
+        
+        
+
+        [%- IF ALL_CONTACTS.size %]
+        
+         
+         
+        
+        [%- END %]
+
+        [%- IF ALL_SHIPTO.size %]
+        
+         
+         
+        
+        [%- END %]
+
+        [%- IF business %]
+        
+         
+         
+        
+        [%- END %]
+
+        [%- IF max_dunning_level %]
+        
+         
+         
+        
+        [%- END %]
+       
+
+       [%- IF ALL_DEPARTMENTS.size %]
+       
+        
+        
+       
+       [%- END %]
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+      
[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
+         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
+         
+         [%- ELSE %]
+         
+         
+         [%- END %]
+         
+        
[% 'Contact Person' | $T8 %]
+          [%- IF delivered %]
+          
+          [%- IF cp_id == row.cp_id %]
+          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
+          [%- END %]
+          [%- ELSE %]
+          
+          [%- END %]
+         
[% 'Shipping Address' | $T8 %]
+          [%- IF delivered %]
+          
+          [%- FOREACH row = ALL_SHIPTO %]
+          [%- IF shipto_id == row.shipto_id %]
+          [%- HTML.escape(row.shiptoname) -%]
+          [%- IF row.shiptodepartment_1 %]; [% HTML.escape(row.shiptodepartment_1) -%][% END -%]
+          [%- IF row.shiptostreet %]; [% HTML.escape(row.shiptostreet) -%][% END -%]
+          [%- IF row.shiptocity %]; [% HTML.escape(row.shiptocity) -%][% END -%]
+          [%- END %]
+          [%- END %]
+
+          [%- ELSE %]
+          
+          [%- END %]
+         
[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %][% HTML.escape(business) %]
[% 'Max. Dunning Level' | $T8 %]
+          [% HTML.escape(max_dunning_level) %]; [% 'Dunning Amount' | $T8 %]:
+          [% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]
+         
[% 'Department' | $T8 %]
+         [%- IF delivered %]
+         
+         [%- FOREACH row = ALL_DEPARTMENTS %]
+         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         
+         [%- END %]
+        
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

+     		
+      
+
+       
+        
+       
+
+       
+
+       
+        
+        
+       
+
+       [%- IF is_customer %]
+       [%- IF salesman_id %]
+       [%- SET the_salesman_id = salesman_id %]
+       [%- ELSE %]
+       [%- SET the_salesman_id = employee_id %]
+       [%- END %]
+       
+        
+        
+       
+       [%- END %]
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+       
+        
+        
+       
+      

+         [%- IF delivered %]
+          [%- IF is_customer %]
+          [% 'transferred out' | $T8 %]
+          [%- ELSE %]
+          [% 'transferred in' | $T8 %]
+          [%- END %]
+         [%- ELSE %]
+          [%- IF is_customer %]
+          [% 'not transferred out yet' | $T8 %]
+          [%- ELSE %]
+          [% 'not transferred in yet' | $T8 %]
+          [%- END %]
+         [%- END %]
+         ;
+         [%- IF closed %]
+          [% 'Closed' | $T8 %]
+         [%- ELSE %]
+          [% 'Open' | $T8 %]
+         [%- END %]
+        
[% 'Employee' | $T8 %]
+         [%- IF delivered %]
+         
+         [%- FOREACH row = ALL_EMPLOYEES %]
+         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         
+         [%- END %]
+        
[% 'Salesman' | $T8 %]
+         [%- IF delivered %]
+         
+         [%- FOREACH row = ALL_SALESMEN %]
+         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         
+         [%- END %]
+        
[% 'Delivery Order Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]
[% 'Delivery Order Date' | $T8 %]
+         
+         [% UNLESS delivered %][% END %]
+        
[% 'Project Number' | $T8 %]
+         [%- IF delivered %]
+         
+         [%- FOREACH row = ALL_PROJECTS %]
+         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         
+         [%- END %]
+        

+     

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
deleted file mode 100644
index 2f98575f0..000000000
--- a/templates/webpages/do/form_header_master.html
+++ /dev/null
@@ -1,356 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
-
- [%- IF vc == 'customer' %]
- [%- SET vc = 'customer' %]
- [%- SET the_vc_id = customer_id %]
- [%- SET the_vc = customer %]
- [%- SET the_oldvc = oldcustomer %]
- [%- SET is_customer = '1' %]
- [%- ELSE %]
- [%- SET vc = 'vendor' %]
- [%- SET the_vc_id = vendor_id %]
- [%- SET the_vc = vendor %]
- [%- SET the_oldvc = oldvendor %]
- [%- SET is_customer = '0' %]
- [%- END %]
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- SET DISABLED = ' disabled' %]
- [%- END %]
-
- 
[% title %]

-
- [%- IF ERRORS && ERRORS.size %]
- 
[% ERRORS.join('
') %]

- [%- END %]
-
- 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  

-   
-    
-     
-
-     
-    
-   

-      
-       
-        
-        
-        
-        
-
-        [%- IF ALL_CONTACTS.size %]
-        
-         
-         
-        
-        [%- END %]
-
-        [%- IF ALL_SHIPTO.size %]
-        
-         
-         
-        
-        [%- END %]
-
-        [%- IF business %]
-        
-         
-         
-        
-        [%- END %]
-
-        [%- IF max_dunning_level %]
-        
-         
-         
-        
-        [%- END %]
-       
-
-       [%- IF ALL_DEPARTMENTS.size %]
-       
-        
-        
-       
-       [%- END %]
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-      
[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
-         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
-         
-         [%- ELSE %]
-         
-         
-         [%- END %]
-         
-        
[% 'Contact Person' | $T8 %]
-          [%- IF delivered %]
-          
-          [%- IF cp_id == row.cp_id %]
-          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-          [%- END %]
-          [%- ELSE %]
-          
-          [%- END %]
-         
[% 'Shipping Address' | $T8 %]
-          [%- IF delivered %]
-          
-          [%- FOREACH row = ALL_SHIPTO %]
-          [%- IF shipto_id == row.shipto_id %]
-          [%- HTML.escape(row.shiptoname) -%]
-          [%- IF row.shiptodepartment_1 %]; [% HTML.escape(row.shiptodepartment_1) -%][% END -%]
-          [%- IF row.shiptostreet %]; [% HTML.escape(row.shiptostreet) -%][% END -%]
-          [%- IF row.shiptocity %]; [% HTML.escape(row.shiptocity) -%][% END -%]
-          [%- END %]
-          [%- END %]
-
-          [%- ELSE %]
-          
-          [%- END %]
-         
[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %][% HTML.escape(business) %]
[% 'Max. Dunning Level' | $T8 %]
-          [% HTML.escape(max_dunning_level) %]; [% 'Dunning Amount' | $T8 %]:
-          [% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]
-         
[% 'Department' | $T8 %]
-         [%- IF delivered %]
-         
-         [%- FOREACH row = ALL_DEPARTMENTS %]
-         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         
-         [%- END %]
-        
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

-     		
-      
-
-       
-        
-       
-
-       
-
-       
-        
-        
-       
-
-       [%- IF is_customer %]
-       [%- IF salesman_id %]
-       [%- SET the_salesman_id = salesman_id %]
-       [%- ELSE %]
-       [%- SET the_salesman_id = employee_id %]
-       [%- END %]
-       
-        
-        
-       
-       [%- END %]
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-       
-        
-        
-       
-      

-         [%- IF delivered %]
-          [%- IF is_customer %]
-          [% 'transferred out' | $T8 %]
-          [%- ELSE %]
-          [% 'transferred in' | $T8 %]
-          [%- END %]
-         [%- ELSE %]
-          [%- IF is_customer %]
-          [% 'not transferred out yet' | $T8 %]
-          [%- ELSE %]
-          [% 'not transferred in yet' | $T8 %]
-          [%- END %]
-         [%- END %]
-         ;
-         [%- IF closed %]
-          [% 'Closed' | $T8 %]
-         [%- ELSE %]
-          [% 'Open' | $T8 %]
-         [%- END %]
-        
[% 'Employee' | $T8 %]
-         [%- IF delivered %]
-         
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         
-         [%- END %]
-        
[% 'Salesman' | $T8 %]
-         [%- IF delivered %]
-         
-         [%- FOREACH row = ALL_SALESMEN %]
-         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         
-         [%- END %]
-        
[% 'Delivery Order Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]
[% 'Delivery Order Date' | $T8 %]
-         
-         [% UNLESS delivered %][% END %]
-        
[% 'Project Number' | $T8 %]
-         [%- IF delivered %]
-         
-         [%- FOREACH row = ALL_PROJECTS %]
-         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         
-         [%- END %]
-        

-     

diff --git a/templates/webpages/do/orders_bottom.html b/templates/webpages/do/orders_bottom.html
new file mode 100644
index 000000000..4138ca40e
--- /dev/null
+++ b/templates/webpages/do/orders_bottom.html
@@ -0,0 +1,10 @@
+[%- USE T8 %]
+[% USE HTML %]
+ [% 'New invoice' | $T8 %]

+ 
+ 
+ 
+ 
+ 
+ 
+

diff --git a/templates/webpages/do/orders_bottom_master.html b/templates/webpages/do/orders_bottom_master.html
deleted file mode 100644
index 4138ca40e..000000000
--- a/templates/webpages/do/orders_bottom_master.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- [% 'New invoice' | $T8 %]

- 
- 
- 
- 
- 
- 
-
diff --git a/templates/webpages/do/orders_top.html b/templates/webpages/do/orders_top.html
new file mode 100644
index 000000000..bd402c4e1
--- /dev/null
+++ b/templates/webpages/do/orders_top.html
@@ -0,0 +1 @@
+

diff --git a/templates/webpages/do/orders_top_master.html b/templates/webpages/do/orders_top_master.html
deleted file mode 100644
index bd402c4e1..000000000
--- a/templates/webpages/do/orders_top_master.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
new file mode 100644
index 000000000..811384c6f
--- /dev/null
+++ b/templates/webpages/do/search.html
@@ -0,0 +1,243 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ [%- IF vc == 'customer' %]
+ [%- SET is_customer = '1' %]
+ [%- ELSE %]
+ [%- SET is_customer = '0' %]
+ [%- END %]
+
+ 
+
+ 
+
+ 
+
+  
[% title %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [%- IF ALL_DEPARTMENTS.size %]
+    
+     
+     
+    
+    [%- END %]
+
+    
+     
+     
+    
+
+    [%- IF is_customer %]
+    
+     
+     
+    
+    [%- END %]
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+    
+   
[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
+      [%- UNLESS SHOW_VC_DROP_DOWN %]
+      
+      [%- ELSE %]
+      
+      
+      [%- END %]
+     
[% 'Delivery Order Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Department' | $T8 %]
+      
+     
[% 'Employee' | $T8 %]
+      
+     
[% 'Salesman' | $T8 %]
+      
+     
[% 'Transaction description' | $T8 %]
[% 'Customer Order Number' | $T8 %]
[% 'Project Number' | $T8 %]
+      
+     
[% 'From' | $T8 %]
+      
+      
+     [% 'Bis' | $T8 %]
+      
+      
+     
[% 'Include in Report' | $T8 %]
+      
+       
+        
+        
+       
+
+       
+        
+        
+       
+
+       
+        
+
+        
+       
+
+       
+        
+
+        
+       
+
+       
+        
+
+        
+       
+
+       
+        
+
+        
+
+        
+       
+
+       
+        
+
+        
+       
+
+      

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+     

+  

+
+  

+
+  

+   
+   
+   
+
+   
+  

+ 

+
+
+
+
diff --git a/templates/webpages/do/search_master.html b/templates/webpages/do/search_master.html
deleted file mode 100644
index 811384c6f..000000000
--- a/templates/webpages/do/search_master.html
+++ /dev/null
@@ -1,243 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- [%- IF vc == 'customer' %]
- [%- SET is_customer = '1' %]
- [%- ELSE %]
- [%- SET is_customer = '0' %]
- [%- END %]
-
- 
-
- 
-
- 

-
-  
[% title %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [%- IF ALL_DEPARTMENTS.size %]
-    
-     
-     
-    
-    [%- END %]
-
-    
-     
-     
-    
-
-    [%- IF is_customer %]
-    
-     
-     
-    
-    [%- END %]
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-    
-   
[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
-      [%- UNLESS SHOW_VC_DROP_DOWN %]
-      
-      [%- ELSE %]
-      
-      
-      [%- END %]
-     
[% 'Delivery Order Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Department' | $T8 %]
-      
-     
[% 'Employee' | $T8 %]
-      
-     
[% 'Salesman' | $T8 %]
-      
-     
[% 'Transaction description' | $T8 %]
[% 'Customer Order Number' | $T8 %]
[% 'Project Number' | $T8 %]
-      
-     
[% 'From' | $T8 %]
-      
-      
-     [% 'Bis' | $T8 %]
-      
-      
-     
[% 'Include in Report' | $T8 %]
-      
-       
-        
-        
-       
-
-       
-        
-        
-       
-
-       
-        
-
-        
-       
-
-       
-        
-
-        
-       
-
-       
-        
-
-        
-       
-
-       
-        
-
-        
-
-        
-       
-
-       
-        
-
-        
-       
-
-      

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-     

-  

-
-  

-
-  

-   
-   
-   
-
-   
-  

- 

-
-
-
-
diff --git a/templates/webpages/do/set_stock_in_out.html b/templates/webpages/do/set_stock_in_out.html
new file mode 100644
index 000000000..36bbf7ff0
--- /dev/null
+++ b/templates/webpages/do/set_stock_in_out.html
@@ -0,0 +1,24 @@
+[% USE HTML %]
+
+ 
+
+ 

+  
+  
+  
+ 

+
+
+
diff --git a/templates/webpages/do/set_stock_in_out_master.html b/templates/webpages/do/set_stock_in_out_master.html
deleted file mode 100644
index 36bbf7ff0..000000000
--- a/templates/webpages/do/set_stock_in_out_master.html
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-
- 
-
- 

-  
-  
-  
- 

-
-
-
diff --git a/templates/webpages/do/stock_in_form.html b/templates/webpages/do/stock_in_form.html
new file mode 100644
index 000000000..238747ef6
--- /dev/null
+++ b/templates/webpages/do/stock_in_form.html
@@ -0,0 +1,184 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %][% USE JavaScript %]
+
+ [%- UNLESS delivered %]
+ 
+ [%- END %]
+
+ 

+
+  
[% title %]

+
+  [%- IF ERRORS && ERRORS.size %]
+  
[% ERRORS.join('
') %]

+  [%- END %]
+
+  

+   
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+   
[% 'Part Number' | $T8 %][% HTML.escape(PART_INFO.partnumber) %]
[% 'Description' | $T8 %][% HTML.escape(PART_INFO.description) %]
[% 'Qty according to delivery order' | $T8 %][% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]

+  

+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  

+   
+    
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+    
+
+    [%- FOREACH row = STOCK_INFO %]
+    
+     
+
+     [%- IF delivered %]
+
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+
+     [%- ELSE %]
+
+     
+
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+
+     
+
+     [%- END %]
+    
+
+    [%- END %]
+   
 [% 'Warehouse' | $T8 %][% 'Bin' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %]
[% loop.count %][% HTML.escape(row.warehouse_description) %][% HTML.escape(row.bin_description) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(LxERP.format_amount(row.qty)) %][% HTML.escape(row.unit) %]
+      
+     
+       
+       
+     
+      
+     

+  

+
+  

+
+  

+   [%- IF delivered %]
+   
+   [%- ELSE %]
+   
+   
+   [%- END %]
+  

+ 

+
+ [%- IF NOT delivered %]
+ [% IF conf_show_best_before %]
+  
+  [% END %]
+  [%- END %]
+
+
+
+
diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
deleted file mode 100644
index 238747ef6..000000000
--- a/templates/webpages/do/stock_in_form_master.html
+++ /dev/null
@@ -1,184 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]
-
- [%- UNLESS delivered %]
- 
- [%- END %]
-
- 

-
-  
[% title %]

-
-  [%- IF ERRORS && ERRORS.size %]
-  
[% ERRORS.join('
') %]

-  [%- END %]
-
-  

-   
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-   
[% 'Part Number' | $T8 %][% HTML.escape(PART_INFO.partnumber) %]
[% 'Description' | $T8 %][% HTML.escape(PART_INFO.description) %]
[% 'Qty according to delivery order' | $T8 %][% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]

-  

-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  

-   
-    
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-    
-
-    [%- FOREACH row = STOCK_INFO %]
-    
-     
-
-     [%- IF delivered %]
-
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-
-     [%- ELSE %]
-
-     
-
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-
-     
-
-     [%- END %]
-    
-
-    [%- END %]
-   
 [% 'Warehouse' | $T8 %][% 'Bin' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %]
[% loop.count %][% HTML.escape(row.warehouse_description) %][% HTML.escape(row.bin_description) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(LxERP.format_amount(row.qty)) %][% HTML.escape(row.unit) %]
-      
-     
-       
-       
-     
-      
-     

-  

-
-  

-
-  

-   [%- IF delivered %]
-   
-   [%- ELSE %]
-   
-   
-   [%- END %]
-  

- 

-
- [%- IF NOT delivered %]
- [% IF conf_show_best_before %]
-  
-  [% END %]
-  [%- END %]
-
-
-
-
diff --git a/templates/webpages/do/stock_out_form.html b/templates/webpages/do/stock_out_form.html
new file mode 100644
index 000000000..f9ffbba10
--- /dev/null
+++ b/templates/webpages/do/stock_out_form.html
@@ -0,0 +1,134 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ [%- IF delivered %]
+ [%- SET RO = ' readonly' %]
+ [%- END %]
+
+ 
+
+ 

+
+  
[% title %]

+
+  [%- IF ERRORS && ERRORS.size %]
+  
[% ERRORS.join('
') %]

+  [%- END %]
+
+  

+   
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+   
[% 'Part Number' | $T8 %][% HTML.escape(PART_INFO.partnumber) %]
[% 'Description' | $T8 %][% HTML.escape(PART_INFO.description) %]
[% 'Qty according to delivery order' | $T8 %][% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]

+  

+
+  [%- UNLESS WHCONTENTS.size %]
+  
[% 'There are no items in stock.' | $T8 %]

+
+  

+
+  [%- ELSE %]
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  

+   
+    
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     [%- UNLESS delivered %]
+     
+     [%- END %]
+     
+     
+    
+
+    [%- FOREACH row = WHCONTENTS %]
+    
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     [%- IF delivered %]
+
+     
+     
+
+     [%- ELSE %]
+
+     
+     
+     
+
+     [%- END %]
+    
+
+    
+    
+    
+    [% IF conf_show_best_before %]
+    
+    [% END %]
+    [%- END %]
+   
 [% 'Warehouse' | $T8 %][% 'Bin' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'Available qty' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %]
[% loop.count %][% HTML.escape(row.warehousedescription) %][% HTML.escape(row.bindescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(LxERP.format_amount(row.stock_qty)) %][% HTML.escape(row.stock_unit) %][% HTML.escape(row.available_qty) %]
+      
+     

+  

+
+  

+
+  

+   [%- IF delivered %]
+   
+   [%- ELSE %]
+   
+   [%- END %]
+  

+
+  [%- END %]
+ 

+
+
+
+
diff --git a/templates/webpages/do/stock_out_form_master.html b/templates/webpages/do/stock_out_form_master.html
deleted file mode 100644
index f9ffbba10..000000000
--- a/templates/webpages/do/stock_out_form_master.html
+++ /dev/null
@@ -1,134 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
- 
-
- 

-
-  
[% title %]

-
-  [%- IF ERRORS && ERRORS.size %]
-  
[% ERRORS.join('
') %]

-  [%- END %]
-
-  

-   
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-   
[% 'Part Number' | $T8 %][% HTML.escape(PART_INFO.partnumber) %]
[% 'Description' | $T8 %][% HTML.escape(PART_INFO.description) %]
[% 'Qty according to delivery order' | $T8 %][% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]

-  

-
-  [%- UNLESS WHCONTENTS.size %]
-  
[% 'There are no items in stock.' | $T8 %]

-
-  

-
-  [%- ELSE %]
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  

-   
-    
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     [%- UNLESS delivered %]
-     
-     [%- END %]
-     
-     
-    
-
-    [%- FOREACH row = WHCONTENTS %]
-    
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     [%- IF delivered %]
-
-     
-     
-
-     [%- ELSE %]
-
-     
-     
-     
-
-     [%- END %]
-    
-
-    
-    
-    
-    [% IF conf_show_best_before %]
-    
-    [% END %]
-    [%- END %]
-   
 [% 'Warehouse' | $T8 %][% 'Bin' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'Available qty' | $T8 %][% 'Qty' | $T8 %][% 'Unit' | $T8 %]
[% loop.count %][% HTML.escape(row.warehousedescription) %][% HTML.escape(row.bindescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(LxERP.format_amount(row.stock_qty)) %][% HTML.escape(row.stock_unit) %][% HTML.escape(row.available_qty) %]
-      
-     

-  

-
-  

-
-  

-   [%- IF delivered %]
-   
-   [%- ELSE %]
-   
-   [%- END %]
-  

-
-  [%- END %]
- 

-
-
-
-
diff --git a/templates/webpages/drafts/load.html b/templates/webpages/drafts/load.html
new file mode 100644
index 000000000..13aae21f3
--- /dev/null
+++ b/templates/webpages/drafts/load.html
@@ -0,0 +1,53 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+
+  
+   
+    
+   
+   
+
+   
+    
+   
+
+   
+    
+   
+
+   
+    
+   
+  
[% 'Load draft' | $T8 %]

+     [% 'The following drafts have been saved and can be loaded.' | $T8 %]
+    

+     
+      
+       
+       
+       
+       
+      
+
+      [% FOREACH row = DRAFTS %]
+       
+        
+        
+        
+        
+       
+      [% END %]
+     
 [% 'Date' | $T8 %][% 'Description' | $T8 %][% 'Employee' | $T8 %]
[% HTML.escape(row.itime) %][% HTML.escape(row.description) %][% HTML.escape(row.employee_name) %]

+    

+     
+     
+     
+    

+
+ 

+
+
diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html
deleted file mode 100644
index 13aae21f3..000000000
--- a/templates/webpages/drafts/load_master.html
+++ /dev/null
@@ -1,53 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-
-  
-   
-    
-   
-   
-
-   
-    
-   
-
-   
-    
-   
-
-   
-    
-   
-  
[% 'Load draft' | $T8 %]

-     [% 'The following drafts have been saved and can be loaded.' | $T8 %]
-    

-     
-      
-       
-       
-       
-       
-      
-
-      [% FOREACH row = DRAFTS %]
-       
-        
-        
-        
-        
-       
-      [% END %]
-     
 [% 'Date' | $T8 %][% 'Description' | $T8 %][% 'Employee' | $T8 %]
[% HTML.escape(row.itime) %][% HTML.escape(row.description) %][% HTML.escape(row.employee_name) %]

-    

-     
-     
-     
-    

-
- 

-
-
diff --git a/templates/webpages/drafts/save_new.html b/templates/webpages/drafts/save_new.html
new file mode 100644
index 000000000..aaf04ac4e
--- /dev/null
+++ b/templates/webpages/drafts/save_new.html
@@ -0,0 +1,34 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+
+  
+   
+    
+   
+   
+
+   
+    
+   
+
+   
+    
+   
+
+   
+    
+   
+  
[% 'Save draft' | $T8 %]
[% 'Enter a description for this new draft.' | $T8 %]

+    [% 'Description' | $T8 %]:
+    
+    

+     
+    

+
+ 

+
+
diff --git a/templates/webpages/drafts/save_new_master.html b/templates/webpages/drafts/save_new_master.html
deleted file mode 100644
index aaf04ac4e..000000000
--- a/templates/webpages/drafts/save_new_master.html
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-
-  
-   
-    
-   
-   
-
-   
-    
-   
-
-   
-    
-   
-
-   
-    
-   
-  
[% 'Save draft' | $T8 %]
[% 'Enter a description for this new draft.' | $T8 %]

-    [% 'Description' | $T8 %]:
-    
-    

-     
-    

-
- 

-
-
diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
new file mode 100644
index 000000000..9b6d4e287
--- /dev/null
+++ b/templates/webpages/dunning/add.html
@@ -0,0 +1,95 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+
+
+ 
[% title %]

+
+ 

+
+  
+   
+    
+    
+   
+
+   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
+    
+     
+     
+    
+   [% END %]
+
+   [% IF SHOW_DEPARTMENT_SELECTION %]
+    
+     
+     
+    
+   [% END %]
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Customer' | $T8 %]
+     [% IF SHOW_CUSTOMER_SELECTION %]
+      
+      [% ELSE %]
+      
+     [% END %]
+    
[% 'Next Dunning Level' | $T8 %]
+      
+     
[% 'Department' | $T8 %]
+      
+     
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Minimum Amount' | $T8 %]
[% 'Group Invoices' | $T8 %]

+
+  
+
+  

+  
+
+ 

+
+
+
+
diff --git a/templates/webpages/dunning/add_master.html b/templates/webpages/dunning/add_master.html
deleted file mode 100644
index 9b6d4e287..000000000
--- a/templates/webpages/dunning/add_master.html
+++ /dev/null
@@ -1,95 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-
-
- 
[% title %]

-
- 

-
-  
-   
-    
-    
-   
-
-   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
-    
-     
-     
-    
-   [% END %]
-
-   [% IF SHOW_DEPARTMENT_SELECTION %]
-    
-     
-     
-    
-   [% END %]
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Customer' | $T8 %]
-     [% IF SHOW_CUSTOMER_SELECTION %]
-      
-      [% ELSE %]
-      
-     [% END %]
-    
[% 'Next Dunning Level' | $T8 %]
-      
-     
[% 'Department' | $T8 %]
-      
-     
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Minimum Amount' | $T8 %]
[% 'Group Invoices' | $T8 %]

-
-  
-
-  

-  
-
- 

-
-
-
-
diff --git a/templates/webpages/dunning/edit_config.html b/templates/webpages/dunning/edit_config.html
new file mode 100644
index 000000000..b539ad938
--- /dev/null
+++ b/templates/webpages/dunning/edit_config.html
@@ -0,0 +1,134 @@
+[%- USE T8 %]
+[% USE HTML %]
+ 
+ 
+
+ 
[% title %]

+
+ 

+  
+   
+
+   
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+   
+
+   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
+    
+     
+
+     
+     
+
+     
+
+
+     
+     
+     
+     
+     
+     
+    
+    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
+   [% END %]
+
+   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
+   
+    
+
+    
+    
+
+    
+
+
+    
+    
+    
+    
+    
+    
+   
+  
[% 'Dunning Level' | $T8 %][% 'Dunning Description' | $T8 %][% 'Active?' | $T8 %][% 'eMail Send?' | $T8 %][% 'Create invoice?' | $T8 %][% 'Fristsetzung' | $T8 %][% 'Duedate +Days' | $T8 %][% 'Fee' | $T8 %][% 'Interest Rate' | $T8 %][% 'Template' | $T8 %]

+      
+      
+      [% DUNNING_it.count %]
+     
+      
+      
+      
+      
+      
+     %

+     
+     
+     [% rowcount %]
+    
+     
+     
+     
+     
+     
+    %

+
+  
+
+  

+
+  
[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Account for fees' | $T8 %]
+     
+    
[% 'Account for interest' | $T8 %]
+     
+    
[% 'Record in' | $T8 %]
+     
+    

+
+  

+
+  
+
+  
+
+ 

+
+
+
diff --git a/templates/webpages/dunning/edit_config_master.html b/templates/webpages/dunning/edit_config_master.html
deleted file mode 100644
index b539ad938..000000000
--- a/templates/webpages/dunning/edit_config_master.html
+++ /dev/null
@@ -1,134 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- 
- 
-
- 
[% title %]

-
- 

-  
-   
-
-   
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-   
-
-   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
-    
-     
-
-     
-     
-
-     
-
-
-     
-     
-     
-     
-     
-     
-    
-    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
-   [% END %]
-
-   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
-   
-    
-
-    
-    
-
-    
-
-
-    
-    
-    
-    
-    
-    
-   
-  
[% 'Dunning Level' | $T8 %][% 'Dunning Description' | $T8 %][% 'Active?' | $T8 %][% 'eMail Send?' | $T8 %][% 'Create invoice?' | $T8 %][% 'Fristsetzung' | $T8 %][% 'Duedate +Days' | $T8 %][% 'Fee' | $T8 %][% 'Interest Rate' | $T8 %][% 'Template' | $T8 %]

-      
-      
-      [% DUNNING_it.count %]
-     
-      
-      
-      
-      
-      
-     %

-     
-     
-     [% rowcount %]
-    
-     
-     
-     
-     
-     
-    %

-
-  
-
-  

-
-  
[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Account for fees' | $T8 %]
-     
-    
[% 'Account for interest' | $T8 %]
-     
-    
[% 'Record in' | $T8 %]
-     
-    

-
-  

-
-  
-
-  
-
- 

-
-
-
diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
new file mode 100644
index 000000000..6611df216
--- /dev/null
+++ b/templates/webpages/dunning/search.html
@@ -0,0 +1,150 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 

+
+  
[% title %]

+
+  
+   
+   
+    
+   
+
+   
+
+   
+    
+   
+  

+     
+      
+       
+       
+      
+
+      [% IF SHOW_DUNNING_LEVELS %]
+       
+        
+        
+       
+      [% END %]
+
+      [% IF SHOW_DEPARTMENT_DDBOX %]
+       
+        
+        
+       
+      [% END %]
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+       
+       
+      
+
+      
+       
+       
+       
+       
+      
+      
+       
+       
+      
+     
[% 'Customer' | $T8 %]
+        [% IF SHOW_CUSTOMER_DDBOX %]
+         
+         [% ELSE %]
+         
+        [% END %]
+       
[% 'Dunning Level' | $T8 %]
+         
+        
[% 'Department' | $T8 %]
+         
+        
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Invdate from' | $T8 %]
+        
+        
+       [% 'To (time)' | $T8 %]
+        
+        
+       
[% 'Dunning Date from' | $T8 %]
+        
+        
+       [% 'To (time)' | $T8 %]
+        
+        
+       
[% 'Salesman' | $T8 %]
+        [%- INCLUDE 'generic/multibox.html'
+            name          = 'salesman_id',
+            style         = 'width: 250px',
+            DATA          =  ALL_SALESMEN,
+            id_key        = 'id',
+            label_sub     = 'salesman_labels',
+            limit         = vclimit,
+            show_empty    = 1,
+            allow_textbox = 0,
+         -%]
+       

+    

+     
+      
+       
+       
+       
+       
+      
+     
[% 'Show old dunnings' | $T8 %][% 'Show Salesman' | $T8 %]

+    

+
+  
+
+  

+
+  
+
+ 

+
+ 
+
+
+
+
diff --git a/templates/webpages/dunning/search_master.html b/templates/webpages/dunning/search_master.html
deleted file mode 100644
index 6611df216..000000000
--- a/templates/webpages/dunning/search_master.html
+++ /dev/null
@@ -1,150 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 

-
-  
[% title %]

-
-  
-   
-   
-    
-   
-
-   
-
-   
-    
-   
-  

-     
-      
-       
-       
-      
-
-      [% IF SHOW_DUNNING_LEVELS %]
-       
-        
-        
-       
-      [% END %]
-
-      [% IF SHOW_DEPARTMENT_DDBOX %]
-       
-        
-        
-       
-      [% END %]
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-       
-       
-      
-
-      
-       
-       
-       
-       
-      
-      
-       
-       
-      
-     
[% 'Customer' | $T8 %]
-        [% IF SHOW_CUSTOMER_DDBOX %]
-         
-         [% ELSE %]
-         
-        [% END %]
-       
[% 'Dunning Level' | $T8 %]
-         
-        
[% 'Department' | $T8 %]
-         
-        
[% 'Invoice Number' | $T8 %]
[% 'Order Number' | $T8 %]
[% 'Notes' | $T8 %]
[% 'Invdate from' | $T8 %]
-        
-        
-       [% 'To (time)' | $T8 %]
-        
-        
-       
[% 'Dunning Date from' | $T8 %]
-        
-        
-       [% 'To (time)' | $T8 %]
-        
-        
-       
[% 'Salesman' | $T8 %]
-        [%- INCLUDE 'generic/multibox.html'
-            name          = 'salesman_id',
-            style         = 'width: 250px',
-            DATA          =  ALL_SALESMEN,
-            id_key        = 'id',
-            label_sub     = 'salesman_labels',
-            limit         = vclimit,
-            show_empty    = 1,
-            allow_textbox = 0,
-         -%]
-       

-    

-     
-      
-       
-       
-       
-       
-      
-     
[% 'Show old dunnings' | $T8 %][% 'Show Salesman' | $T8 %]

-    

-
-  
-
-  

-
-  
-
- 

-
- 
-
-
-
-
diff --git a/templates/webpages/dunning/set_email.html b/templates/webpages/dunning/set_email.html
new file mode 100644
index 000000000..1b96ed91e
--- /dev/null
+++ b/templates/webpages/dunning/set_email.html
@@ -0,0 +1,43 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 

+
+  
+  
+  
+
+  
[% title %]

+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Subject:' | $T8 %]
[% 'Body:' | $T8 %]
[% 'Attach PDF:' | $T8 %]

+
+  
+
+ 

+
+
diff --git a/templates/webpages/dunning/set_email_master.html b/templates/webpages/dunning/set_email_master.html
deleted file mode 100644
index 1b96ed91e..000000000
--- a/templates/webpages/dunning/set_email_master.html
+++ /dev/null
@@ -1,43 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 

-
-  
-  
-  
-
-  
[% title %]

-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Subject:' | $T8 %]
[% 'Body:' | $T8 %]
[% 'Attach PDF:' | $T8 %]

-
-  
-
- 

-
-
diff --git a/templates/webpages/dunning/show_dunning_bottom.html b/templates/webpages/dunning/show_dunning_bottom.html
new file mode 100644
index 000000000..8230082bc
--- /dev/null
+++ b/templates/webpages/dunning/show_dunning_bottom.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]  
+
+  
[% PRINT_OPTIONS %]

+
+  

+   [% 'Dunnings' | $T8 %]

+   
+   
+  

+
+ 
diff --git a/templates/webpages/dunning/show_dunning_bottom_master.html b/templates/webpages/dunning/show_dunning_bottom_master.html
deleted file mode 100644
index 8230082bc..000000000
--- a/templates/webpages/dunning/show_dunning_bottom_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]  
-
-  
[% PRINT_OPTIONS %]

-
-  

-   [% 'Dunnings' | $T8 %]

-   
-   
-  

-
- 
diff --git a/templates/webpages/dunning/show_dunning_top.html b/templates/webpages/dunning/show_dunning_top.html
new file mode 100644
index 000000000..f835f956d
--- /dev/null
+++ b/templates/webpages/dunning/show_dunning_top.html
@@ -0,0 +1,5 @@
+[% USE HTML %] 
+ 
+
+ 

+
diff --git a/templates/webpages/dunning/show_dunning_top_master.html b/templates/webpages/dunning/show_dunning_top_master.html
deleted file mode 100644
index f835f956d..000000000
--- a/templates/webpages/dunning/show_dunning_top_master.html
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %] 
- 
-
- 
-
diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
new file mode 100644
index 000000000..db6b1adfd
--- /dev/null
+++ b/templates/webpages/dunning/show_invoices.html
@@ -0,0 +1,90 @@
+[%- USE T8 %]
+[% USE HTML %]
+ 
+ 
+ 
+
+ 
[% title %]

+
+ 
[% 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' | $T8 %]

+
+ 
+
+  
+   
+
+   
+
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+
+   [% FOREACH row = DUNNINGS %]
+    
+
+     
+
+     
+
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+    
+   [% END %]
+  
[% 'Current / Next Level' | $T8 %]
+    
+    
+   
+    
+    
+   [% 'Customername' | $T8 %][% 'Invno.' | $T8 %][% 'Invdate' | $T8 %][% 'Inv. Duedate' | $T8 %][% 'Amount' | $T8 %][% 'Open Amount' | $T8 %][% 'Dunning Duedate' | $T8 %][% 'Total Fees' | $T8 %][% 'Interest' | $T8 %]

+      
+      
+      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %] [% END %]
+     
+      
+     [% HTML.escape(row.customername) %]
+      
+      [% HTML.escape(row.invnumber) %]
+     [% HTML.escape(row.transdate) %][% HTML.escape(row.duedate) %][% HTML.escape(row.amount) %][% HTML.escape(row.open_amount) %][% HTML.escape(row.next_duedate) %][% HTML.escape(row.fee) %][% HTML.escape(row.interest) %]

+
+  

+
+  [% PRINT_OPTIONS %]
+
+  

+
+  
+  
+
+  
+  
+
+  
+
+  
+
+ 

+
+
diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
deleted file mode 100644
index db6b1adfd..000000000
--- a/templates/webpages/dunning/show_invoices_master.html
+++ /dev/null
@@ -1,90 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- 
- 
- 
-
- 
[% title %]

-
- 
[% 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' | $T8 %]

-
- 

-
-  
-   
-
-   
-
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-
-   [% FOREACH row = DUNNINGS %]
-    
-
-     
-
-     
-
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-     
-    
-   [% END %]
-  
[% 'Current / Next Level' | $T8 %]
-    
-    
-   
-    
-    
-   [% 'Customername' | $T8 %][% 'Invno.' | $T8 %][% 'Invdate' | $T8 %][% 'Inv. Duedate' | $T8 %][% 'Amount' | $T8 %][% 'Open Amount' | $T8 %][% 'Dunning Duedate' | $T8 %][% 'Total Fees' | $T8 %][% 'Interest' | $T8 %]

-      
-      
-      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %] [% END %]
-     
-      
-     [% HTML.escape(row.customername) %]
-      
-      [% HTML.escape(row.invnumber) %]
-     [% HTML.escape(row.transdate) %][% HTML.escape(row.duedate) %][% HTML.escape(row.amount) %][% HTML.escape(row.open_amount) %][% HTML.escape(row.next_duedate) %][% HTML.escape(row.fee) %][% HTML.escape(row.interest) %]

-
-  

-
-  [% PRINT_OPTIONS %]
-
-  

-
-  
-  
-
-  
-  
-
-  
-
-  
-
- 

-
-
diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html
new file mode 100644
index 000000000..d32f3fcb0
--- /dev/null
+++ b/templates/webpages/fu/add_edit.html
@@ -0,0 +1,110 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 

+
+  [%- IF SAVED_MESSAGE %]
+  
[% SAVED_MESSAGE %]

+  [%- END %]
+
+  
[% title %]

+
+  
+  
+  
+  
+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+   
[% 'Follow-Up for user' | $T8 %]
+      
+     
[% 'Follow-Up Date' | $T8 %]
+      
+      
+    
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]

+  

+
+  

+   
+   
+   [%- IF id %]
+   
+   
+   [%- END %]
+   [%- IF POPUP_MODE %]
+   
+   [%- END %]
+  

+
+  [%- IF POPUP_MODE %]
+  [%- IF FOLLOW_UPS.size %]
+  

+
+  
[% 'Existing pending follow-ups for this item' | $T8 %]

+
+  

+   
+    
+     
+     
+     
+     
+    
+
+    [%- FOREACH row = FOLLOW_UPS %]
+    
+     
+     
+     
+     
+    
+    [%- END %]
+   
[% 'Follow-Up Date' | $T8 %][% 'Subject' | $T8 %][% 'Created by' | $T8 %][% 'Follow-up for' | $T8 %]
[% HTML.escape(row.follow_up_date) %][% HTML.escape(row.subject) %][% HTML.escape(row.created_by_name) %][% HTML.escape(row.created_for_user_name) %]

+  

+  [%- END %]
+  [%- END %]
+
+  [%- FOREACH row = LINKS %]
+  
+  
+  
+  [%- END %]
+
+  
+ 

+
+
+
diff --git a/templates/webpages/fu/add_edit_master.html b/templates/webpages/fu/add_edit_master.html
deleted file mode 100644
index d32f3fcb0..000000000
--- a/templates/webpages/fu/add_edit_master.html
+++ /dev/null
@@ -1,110 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 

-
-  [%- IF SAVED_MESSAGE %]
-  
[% SAVED_MESSAGE %]

-  [%- END %]
-
-  
[% title %]

-
-  
-  
-  
-  
-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-   
[% 'Follow-Up for user' | $T8 %]
-      
-     
[% 'Follow-Up Date' | $T8 %]
-      
-      
-    
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]

-  

-
-  

-   
-   
-   [%- IF id %]
-   
-   
-   [%- END %]
-   [%- IF POPUP_MODE %]
-   
-   [%- END %]
-  

-
-  [%- IF POPUP_MODE %]
-  [%- IF FOLLOW_UPS.size %]
-  

-
-  
[% 'Existing pending follow-ups for this item' | $T8 %]

-
-  

-   
-    
-     
-     
-     
-     
-    
-
-    [%- FOREACH row = FOLLOW_UPS %]
-    
-     
-     
-     
-     
-    
-    [%- END %]
-   
[% 'Follow-Up Date' | $T8 %][% 'Subject' | $T8 %][% 'Created by' | $T8 %][% 'Follow-up for' | $T8 %]
[% HTML.escape(row.follow_up_date) %][% HTML.escape(row.subject) %][% HTML.escape(row.created_by_name) %][% HTML.escape(row.created_for_user_name) %]

-  

-  [%- END %]
-  [%- END %]
-
-  [%- FOREACH row = LINKS %]
-  
-  
-  
-  [%- END %]
-
-  
- 

-
-
-
diff --git a/templates/webpages/fu/close_window.html b/templates/webpages/fu/close_window.html
new file mode 100644
index 000000000..d1668652f
--- /dev/null
+++ b/templates/webpages/fu/close_window.html
@@ -0,0 +1 @@
+
diff --git a/templates/webpages/fu/close_window_master.html b/templates/webpages/fu/close_window_master.html
deleted file mode 100644
index d1668652f..000000000
--- a/templates/webpages/fu/close_window_master.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/templates/webpages/fu/edit_access_rights.html b/templates/webpages/fu/edit_access_rights.html
new file mode 100644
index 000000000..2c807150e
--- /dev/null
+++ b/templates/webpages/fu/edit_access_rights.html
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ [%- IF SAVED_MESSAGE %]
+ 
[% SAVED_MESSAGE %]

+ [%- END %]
+
+ 
[% title %]

+
+ 
[% 'Allow the following users access to my follow-ups:' | $T8 %]

+
+ 

+  

+   
+    
+     
+     
+    
+
+    [%- FOREACH row = EMPLOYEES %]
+    [%- UNLESS row.login == login %]
+    
+
+    
+     
+     
+    
+    [%- END %]
+    [%- END %]
+   
[% 'User' | $T8 %][% 'Allow access' | $T8 %]
[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
+      
+      
+      
+      
+     

+  

+
+  
+  
+
+  

+   
+  

+
+ 

+
+
diff --git a/templates/webpages/fu/edit_access_rights_master.html b/templates/webpages/fu/edit_access_rights_master.html
deleted file mode 100644
index 2c807150e..000000000
--- a/templates/webpages/fu/edit_access_rights_master.html
+++ /dev/null
@@ -1,48 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- [%- IF SAVED_MESSAGE %]
- 
[% SAVED_MESSAGE %]

- [%- END %]
-
- 
[% title %]

-
- 
[% 'Allow the following users access to my follow-ups:' | $T8 %]

-
- 

-  

-   
-    
-     
-     
-    
-
-    [%- FOREACH row = EMPLOYEES %]
-    [%- UNLESS row.login == login %]
-    
-
-    
-     
-     
-    
-    [%- END %]
-    [%- END %]
-   
[% 'User' | $T8 %][% 'Allow access' | $T8 %]
[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-      
-      
-      
-      
-     

-  

-
-  
-  
-
-  

-   
-  

-
- 

-
-
diff --git a/templates/webpages/fu/report_bottom.html b/templates/webpages/fu/report_bottom.html
new file mode 100644
index 000000000..54927a759
--- /dev/null
+++ b/templates/webpages/fu/report_bottom.html
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML%]
+ 
+ [%- FOREACH item = HIDDEN %]
+ 
+ [%- END %]
+
+ 

+  [% 'Follow-Ups' | $T8 %]

+  
+  
+  
+ 

+
diff --git a/templates/webpages/fu/report_bottom_master.html b/templates/webpages/fu/report_bottom_master.html
deleted file mode 100644
index 54927a759..000000000
--- a/templates/webpages/fu/report_bottom_master.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- USE T8 %]
-[% USE HTML%]
- 
- [%- FOREACH item = HIDDEN %]
- 
- [%- END %]
-
- 

-  [% 'Follow-Ups' | $T8 %]

-  
-  
-  
- 

-
diff --git a/templates/webpages/fu/report_for_todo_list.html b/templates/webpages/fu/report_for_todo_list.html
new file mode 100644
index 000000000..e8186333b
--- /dev/null
+++ b/templates/webpages/fu/report_for_todo_list.html
@@ -0,0 +1,42 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
[% 'Unfinished follow-ups' | $T8 %]

+
+

+ 
+ 
+
+ 

+  
+   
+    
+    
+    
+    
+    
+    
+   
+
+   [%- FOREACH row = FOLLOW_UPS %]
+   
+    
+    
+    
+    
+    
+    
+   
+   [%- END %]
+  
 [% 'Follow-Up Date' | $T8 %][% 'Created on' | $T8 %][% 'Subject' | $T8 %][% 'Reference' | $T8 %][% 'Created by' | $T8 %]

+     
+     
+    [% HTML.escape(row.follow_up_date) %][% HTML.escape(row.created_on) %][% HTML.escape(row.subject) %][% IF row.reference_link %][% END %][% HTML.escape(row.reference) %][% IF row.reference_link %][% END %][% HTML.escape(row.created_by_name) %]

+ 

+
+ 

+  
+  
+  
+ 

+

diff --git a/templates/webpages/fu/report_for_todo_list_master.html b/templates/webpages/fu/report_for_todo_list_master.html
deleted file mode 100644
index e8186333b..000000000
--- a/templates/webpages/fu/report_for_todo_list_master.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
[% 'Unfinished follow-ups' | $T8 %]

-
-

- 
- 
-
- 

-  
-   
-    
-    
-    
-    
-    
-    
-   
-
-   [%- FOREACH row = FOLLOW_UPS %]
-   
-    
-    
-    
-    
-    
-    
-   
-   [%- END %]
-  
 [% 'Follow-Up Date' | $T8 %][% 'Created on' | $T8 %][% 'Subject' | $T8 %][% 'Reference' | $T8 %][% 'Created by' | $T8 %]

-     
-     
-    [% HTML.escape(row.follow_up_date) %][% HTML.escape(row.created_on) %][% HTML.escape(row.subject) %][% IF row.reference_link %][% END %][% HTML.escape(row.reference) %][% IF row.reference_link %][% END %][% HTML.escape(row.created_by_name) %]

- 

-
- 

-  
-  
-  
- 

-

diff --git a/templates/webpages/fu/report_top.html b/templates/webpages/fu/report_top.html
new file mode 100644
index 000000000..f6847d978
--- /dev/null
+++ b/templates/webpages/fu/report_top.html
@@ -0,0 +1,10 @@
+[%- IF OPTIONS.size %]
+

+ [%- FOREACH option = OPTIONS %]
+ [%- option %][% UNLESS loop.last %]
[% END %]
+ [%- END %]
+

+[%- END %]
+
+

+
diff --git a/templates/webpages/fu/report_top_master.html b/templates/webpages/fu/report_top_master.html
deleted file mode 100644
index f6847d978..000000000
--- a/templates/webpages/fu/report_top_master.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- IF OPTIONS.size %]
-

- [%- FOREACH option = OPTIONS %]
- [%- option %][% UNLESS loop.last %]
[% END %]
- [%- END %]
-

-[%- END %]
-
-
-
diff --git a/templates/webpages/fu/search.html b/templates/webpages/fu/search.html
new file mode 100644
index 000000000..63d8c0a22
--- /dev/null
+++ b/templates/webpages/fu/search.html
@@ -0,0 +1,123 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ 
+
+ 
[% title %]

+
+ 
+  
+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+   
[% 'Created for' | $T8 %]
+      
+     
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]
[% 'Reference' | $T8 %]
[% 'Follow-Up Date' | $T8 %]
+      [% 'From' | $T8 %]
+      
+      
+      [% 'To (time)' | $T8 %]
+      
+      
+     
[% 'Created on' | $T8 %]
+      [% 'From' | $T8 %]
+      
+      
+      [% 'To (time)' | $T8 %]
+      
+      
+     
[% 'Include in Report' | $T8 %]
+
+      
+       
+        
+
+        
+       
+
+       
+        
+
+        
+       
+      

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+
+     

+  

+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/fu/search_master.html b/templates/webpages/fu/search_master.html
deleted file mode 100644
index 63d8c0a22..000000000
--- a/templates/webpages/fu/search_master.html
+++ /dev/null
@@ -1,123 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- 
-
- 
[% title %]

-
- 

-  
-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-   
[% 'Created for' | $T8 %]
-      
-     
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]
[% 'Reference' | $T8 %]
[% 'Follow-Up Date' | $T8 %]
-      [% 'From' | $T8 %]
-      
-      
-      [% 'To (time)' | $T8 %]
-      
-      
-     
[% 'Created on' | $T8 %]
-      [% 'From' | $T8 %]
-      
-      
-      [% 'To (time)' | $T8 %]
-      
-      
-     
[% 'Include in Report' | $T8 %]
-
-      
-       
-        
-
-        
-       
-
-       
-        
-
-        
-       
-      

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-
-     

-  

-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/generic/calculate_qty.html b/templates/webpages/generic/calculate_qty.html
new file mode 100644
index 000000000..974c78c43
--- /dev/null
+++ b/templates/webpages/generic/calculate_qty.html
@@ -0,0 +1,84 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+  
+
+  
+   
+    
+   
+   
+
+   
+
+   
+    
+   
+  
[% title %]
[% 'Please insert object dimensions below.' | $T8 %]

+
+     
+      
+       [% FOREACH col = HEADER %]
+        
+       [% END %]
+      
+
+      [% FOREACH row = VARIABLES %]
+       
+        
+        
+       
+      [% END %]
+     
[% col.column_title %]
[% HTML.escape(row.description) %]:[% HTML.escape(row.unit) %]

+
+    

+ 
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/calculate_qty_master.html b/templates/webpages/generic/calculate_qty_master.html
deleted file mode 100644
index 974c78c43..000000000
--- a/templates/webpages/generic/calculate_qty_master.html
+++ /dev/null
@@ -1,84 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-  
-
-  
-   
-    
-   
-   
-
-   
-
-   
-    
-   
-  
[% title %]
[% 'Please insert object dimensions below.' | $T8 %]

-
-     
-      
-       [% FOREACH col = HEADER %]
-        
-       [% END %]
-      
-
-      [% FOREACH row = VARIABLES %]
-       
-        
-        
-       
-      [% END %]
-     
[% col.column_title %]
[% HTML.escape(row.description) %]:[% HTML.escape(row.unit) %]

-
-    

- 
- 

-
- 
-
-
-
diff --git a/templates/webpages/generic/cov_selection.html b/templates/webpages/generic/cov_selection.html
new file mode 100644
index 000000000..f3cdbcdb4
--- /dev/null
+++ b/templates/webpages/generic/cov_selection.html
@@ -0,0 +1,104 @@
+[%- USE T8 %]
+[%- USE HTML %]
+
+
+ 

+
+  
+  
+  
+  
+  
+
+  
+   
+    
+   
+   
+
+   
+    
+   
+
+   
+    
+   
+  
[% title %]

+     [%- IF !is_vendor %]
+      [% 'Please select a customer from the list below.' | $T8 %]
+     [%- ELSE %]
+      [% 'Please select a vendor from the list below.' | $T8 %]
+     [%- END %]
+    

+
+     
+      
+       
+       [%- FOREACH row = HEADER %]
+        
+       [%- END %]
+      
+
+      [%- FOREACH row = COVS %]
+       
+        
+        
+        
+        
+       
+      [% END %]
+     
 [% row.column_title %]

+         
+         
+         [% HTML.escape(row.name) %][% HTML.escape(row.address) %][% HTML.escape(row.contact) %]

+
+    

+
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/cov_selection_master.html b/templates/webpages/generic/cov_selection_master.html
deleted file mode 100644
index f3cdbcdb4..000000000
--- a/templates/webpages/generic/cov_selection_master.html
+++ /dev/null
@@ -1,104 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-
-
- 

-
-  
-  
-  
-  
-  
-
-  
-   
-    
-   
-   
-
-   
-    
-   
-
-   
-    
-   
-  
[% title %]

-     [%- IF !is_vendor %]
-      [% 'Please select a customer from the list below.' | $T8 %]
-     [%- ELSE %]
-      [% 'Please select a vendor from the list below.' | $T8 %]
-     [%- END %]
-    

-
-     
-      
-       
-       [%- FOREACH row = HEADER %]
-        
-       [%- END %]
-      
-
-      [%- FOREACH row = COVS %]
-       
-        
-        
-        
-        
-       
-      [% END %]
-     
 [% row.column_title %]

-         
-         
-         [% HTML.escape(row.name) %][% HTML.escape(row.address) %][% HTML.escape(row.contact) %]

-
-    

-
- 

-
- 
-
-
-
diff --git a/templates/webpages/generic/edit_email.html b/templates/webpages/generic/edit_email.html
new file mode 100644
index 000000000..9aec0ca97
--- /dev/null
+++ b/templates/webpages/generic/edit_email.html
@@ -0,0 +1,76 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+

+
+
+  
+
+    
+  
+  
+  
+    
+  
+
+  
+    
+  
+  
+    
+  
+
+  
+    
+  
+
[% title %]

+      
+        
+          
+
+          
+        
+        
+          
+          
+        
+[% IF SHOW_BCC %]
+        
+          
+          
+        [% END %]
+        
+          
+
+          
+        
+        
+          
+          
+      
[% 'To' | $T8 %]
[% 'Cc' | $T8 %]
[% 'Bcc' | $T8 %]
[% 'Subject' | $T8 %]
[% 'Attachment name' | $T8 %]

+    

+      
+        
+          
+        
+        
+          
+
+        
+      
[% 'Message' | $T8 %]

+    

+
+[% print_options %]
+[% FOREACH row = HIDDEN %]
+[% END %]
+
+    

+
+
+
+

+
+

+
+
+
diff --git a/templates/webpages/generic/edit_email_master.html b/templates/webpages/generic/edit_email_master.html
deleted file mode 100644
index 9aec0ca97..000000000
--- a/templates/webpages/generic/edit_email_master.html
+++ /dev/null
@@ -1,76 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-

-
-
-  
-
-    
-  
-  
-  
-    
-  
-
-  
-    
-  
-  
-    
-  
-
-  
-    
-  
-
[% title %]

-      
-        
-          
-
-          
-        
-        
-          
-          
-        
-[% IF SHOW_BCC %]
-        
-          
-          
-        [% END %]
-        
-          
-
-          
-        
-        
-          
-          
-      
[% 'To' | $T8 %]
[% 'Cc' | $T8 %]
[% 'Bcc' | $T8 %]
[% 'Subject' | $T8 %]
[% 'Attachment name' | $T8 %]

-    

-      
-        
-          
-        
-        
-          
-
-        
-      
[% 'Message' | $T8 %]

-    

-
-[% print_options %]
-[% FOREACH row = HIDDEN %]
-[% END %]
-
-    

-
-
-
-

-
-

-
-
-
diff --git a/templates/webpages/generic/error.html b/templates/webpages/generic/error.html
new file mode 100644
index 000000000..628208522
--- /dev/null
+++ b/templates/webpages/generic/error.html
@@ -0,0 +1,33 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]

+
+ 
[% label_error %]

+
+ [%- IF SHOW_BACK_BUTTON %]
+ 

+  

+   
+  

+ 

+
+ [%- ELSIF SHOW_BUTTON %]
+
+ 

+
+  [%- FOREACH var = VARIABLES %]
+  
+  [%- END %]
+
+  
+
+  

+   
+  

+ 

+
+ [%- END %]
+
+
+
diff --git a/templates/webpages/generic/error_master.html b/templates/webpages/generic/error_master.html
deleted file mode 100644
index 628208522..000000000
--- a/templates/webpages/generic/error_master.html
+++ /dev/null
@@ -1,33 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]

-
- 
[% label_error %]

-
- [%- IF SHOW_BACK_BUTTON %]
- 

-  

-   
-  

- 

-
- [%- ELSIF SHOW_BUTTON %]
-
- 

-
-  [%- FOREACH var = VARIABLES %]
-  
-  [%- END %]
-
-  
-
-  

-   
-  

- 

-
- [%- END %]
-
-
-
diff --git a/templates/webpages/generic/information.html b/templates/webpages/generic/information.html
new file mode 100644
index 000000000..29e417169
--- /dev/null
+++ b/templates/webpages/generic/information.html
@@ -0,0 +1,13 @@
+[%- USE T8 %]
+[% USE HTML %]
+ 
+  
+   
+  
+  
+
+  
+ 
[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]
[% label_information %]

+
+
+
diff --git a/templates/webpages/generic/information_master.html b/templates/webpages/generic/information_master.html
deleted file mode 100644
index 29e417169..000000000
--- a/templates/webpages/generic/information_master.html
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- 
-  
-   
-  
-  
-
-  
- 
[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]
[% label_information %]

-
-
-
diff --git a/templates/webpages/generic/new_item.html b/templates/webpages/generic/new_item.html
new file mode 100644
index 000000000..1d3104a6d
--- /dev/null
+++ b/templates/webpages/generic/new_item.html
@@ -0,0 +1,27 @@
+[%- USE T8 %]
+[% USE HTML %]  
+
+    
[% 'Item not on file!' | $T8 %]
+
+
+    
[% 'What type of item is this?' | $T8 %]

+
+    

+
+      

+
+       [% 'Part' | $T8 %]

+       [% 'Service' | $T8 %]
+      

+
+      [%- FOREACH var = HIDDENS %]
+      
+      [%- END %]
+
+      
+      
+    

+
+  
+
+
diff --git a/templates/webpages/generic/new_item_master.html b/templates/webpages/generic/new_item_master.html
deleted file mode 100644
index 1d3104a6d..000000000
--- a/templates/webpages/generic/new_item_master.html
+++ /dev/null
@@ -1,27 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]  
-
-    
[% 'Item not on file!' | $T8 %]
-
-
-    
[% 'What type of item is this?' | $T8 %]

-
-    

-
-      

-
-       [% 'Part' | $T8 %]

-       [% 'Service' | $T8 %]
-      

-
-      [%- FOREACH var = HIDDENS %]
-      
-      [%- END %]
-
-      
-      
-    

-
-  
-
-
diff --git a/templates/webpages/generic/part_selection.html b/templates/webpages/generic/part_selection.html
new file mode 100644
index 000000000..ac4aa4a21
--- /dev/null
+++ b/templates/webpages/generic/part_selection.html
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
[% title %]

+
+  
+   
+    
+   
+
+   [% UNLESS no_parts_found %]
+   
+    
+   
+   [% END %]
+  

+     [% IF no_parts_found %]
+     [% 'No part was found matching the search parameters.' | $T8 %]
+     [% IF allow_creation %]
+     [% 'However, you can create a new part which will then be selected.' | $T8 %]
+     [% END %]
+     [% ELSE %]
+     [% 'Please select a part from the list below.' | $T8 %]
+     [% IF allow_creation %]
+     [% 'Alternatively you can create a new part which will then be selected.' | $T8 %]
+     [% END %]
+     [% END %]
+    

+     
+      
+       
+       [% FOREACH header = HEADER %]
+       
+       [% END %]
+      
+
+      [% FOREACH part = PARTS %]
+      
+       
+       
+       
+
+
+
+
+      
+      [% END %]
+     
 [% header.column_title %]

+        
+        
+        [% HTML.escape(part.partnumber) %]
+       
+        
+        
+        [% HTML.escape(part.description) %]
+       

+    

+
+  [% IF allow_creation %]
+  

+  [% END %]
+
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/part_selection_master.html b/templates/webpages/generic/part_selection_master.html
deleted file mode 100644
index ac4aa4a21..000000000
--- a/templates/webpages/generic/part_selection_master.html
+++ /dev/null
@@ -1,122 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
[% title %]

-
-  
-   
-    
-   
-
-   [% UNLESS no_parts_found %]
-   
-    
-   
-   [% END %]
-  

-     [% IF no_parts_found %]
-     [% 'No part was found matching the search parameters.' | $T8 %]
-     [% IF allow_creation %]
-     [% 'However, you can create a new part which will then be selected.' | $T8 %]
-     [% END %]
-     [% ELSE %]
-     [% 'Please select a part from the list below.' | $T8 %]
-     [% IF allow_creation %]
-     [% 'Alternatively you can create a new part which will then be selected.' | $T8 %]
-     [% END %]
-     [% END %]
-    

-     
-      
-       
-       [% FOREACH header = HEADER %]
-       
-       [% END %]
-      
-
-      [% FOREACH part = PARTS %]
-      
-       
-       
-       
-
-
-
-
-      
-      [% END %]
-     
 [% header.column_title %]

-        
-        
-        [% HTML.escape(part.partnumber) %]
-       
-        
-        
-        [% HTML.escape(part.description) %]
-       

-    

-
-  [% IF allow_creation %]
-  

-  [% END %]
-
- 

-
- 
-
-
-
diff --git a/templates/webpages/generic/print_options.html b/templates/webpages/generic/print_options.html
new file mode 100644
index 000000000..f8ee3efd3
--- /dev/null
+++ b/templates/webpages/generic/print_options.html
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ 
+  
+  
+ 
+

+   
+    
+     
+     [%- IF display_copies %]
+     
+     [%- END %]
+     [%- IF display_groupitems %]
+     
+     
+     [%- END %]
+     [%- IF display_remove_draft %]
+     
+     
+     [%- END %]
+    
+   

+      [%- FOREACH row = SELECTS %]
+      [%- IF row.show %]
+      
+      [%- END %]
+      [%- END %]
+     [% 'Copies' | $T8 %] [% 'Group Items' | $T8 %][% 'Remove Draft' | $T8 %]

+  		
+   
[% status_msg %]

+  

+
diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
deleted file mode 100644
index f8ee3efd3..000000000
--- a/templates/webpages/generic/print_options_master.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- 
-  
-  
- 
-

-   
-    
-     
-     [%- IF display_copies %]
-     
-     [%- END %]
-     [%- IF display_groupitems %]
-     
-     
-     [%- END %]
-     [%- IF display_remove_draft %]
-     
-     
-     [%- END %]
-    
-   

-      [%- FOREACH row = SELECTS %]
-      [%- IF row.show %]
-      
-      [%- END %]
-      [%- END %]
-     [% 'Copies' | $T8 %] [% 'Group Items' | $T8 %][% 'Remove Draft' | $T8 %]

-  		
-   
[% status_msg %]

-  

-
diff --git a/templates/webpages/generic/select_delivery_customer.html b/templates/webpages/generic/select_delivery_customer.html
new file mode 100644
index 000000000..20858c1ad
--- /dev/null
+++ b/templates/webpages/generic/select_delivery_customer.html
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+  
+
+  
[% title %]

+
+  
+   
+
+   
+
+   
+    
+   
+  
[% 'Please select a customer from the list below.' | $T8 %]

+
+     
+      
+       
+       [%- FOREACH col = HEADER %]
+       
+       [%- END %]
+      
+
+      [%- FOREACH row = DELIVERY %]
+      
+       
+       
+       
+       
+
+
+
+
+      
+      [%- END %]
+     
 [% col.column_title %]

+        
+        
+        [% HTML.escape(row.name) %]
+       [% HTML.escape(row.customernumber) %][% HTML.escape(row.address) %]

+
+    

+
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/select_delivery_customer_master.html b/templates/webpages/generic/select_delivery_customer_master.html
deleted file mode 100644
index 20858c1ad..000000000
--- a/templates/webpages/generic/select_delivery_customer_master.html
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-  
-
-  
[% title %]

-
-  
-   
-
-   
-
-   
-    
-   
-  
[% 'Please select a customer from the list below.' | $T8 %]

-
-     
-      
-       
-       [%- FOREACH col = HEADER %]
-       
-       [%- END %]
-      
-
-      [%- FOREACH row = DELIVERY %]
-      
-       
-       
-       
-       
-
-
-
-
-      
-      [%- END %]
-     
 [% col.column_title %]

-        
-        
-        [% HTML.escape(row.name) %]
-       [% HTML.escape(row.customernumber) %][% HTML.escape(row.address) %]

-
-    

-
- 

-
- 
-
-
-
diff --git a/templates/webpages/generic/select_part.html b/templates/webpages/generic/select_part.html
new file mode 100644
index 000000000..324c4738a
--- /dev/null
+++ b/templates/webpages/generic/select_part.html
@@ -0,0 +1,85 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+  
+
+  
+  
+  
+
+  
[% 'Select a part or assembly' | $T8 %]

+
+  

+   
+    
+     
+     
+     
+     [% IF has_charge %]
+     
+     [% END %]
+     [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     [% END %]
+     [% IF has_ean %]
+     
+     [% END %]
+    
+
+    [% FOREACH part = PARTS %]
+    
+     
+
+     
+
+     
+
+     [% IF has_charge %]
+     
+     [% END %]
+     [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     [% END %]
+     [% IF has_ean %]
+     
+    
+    [% END %]
+   
 [% 'Number' | $T8 %][% 'Description' | $T8 %][% 'Charge number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %]

+      
+     
+      
+      
+      [% HTML.escape(part.number) %]
+     
+      
+      [% HTML.escape(part.description) %]
+     
+      
+      
+      [% HTML.escape(part.chargenumber) %]
+     
+      
+      
+      [% HTML.escape(part.bestbefore) %]
+     
+      
+      [% HTML.escape(part.ean) %]
+     [% END %]
+     

+  

+
+  

+   
+  

+
+ 

+
+
+
diff --git a/templates/webpages/generic/select_part_master.html b/templates/webpages/generic/select_part_master.html
deleted file mode 100644
index 324c4738a..000000000
--- a/templates/webpages/generic/select_part_master.html
+++ /dev/null
@@ -1,85 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-  
-
-  
-  
-  
-
-  
[% 'Select a part or assembly' | $T8 %]

-
-  

-   
-    
-     
-     
-     
-     [% IF has_charge %]
-     
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     
-     [% END %]
-    
-
-    [% FOREACH part = PARTS %]
-    
-     
-
-     
-
-     
-
-     [% IF has_charge %]
-     
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     
-    
-    [% END %]
-   
 [% 'Number' | $T8 %][% 'Description' | $T8 %][% 'Charge number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %]

-      
-     
-      
-      
-      [% HTML.escape(part.number) %]
-     
-      
-      [% HTML.escape(part.description) %]
-     
-      
-      
-      [% HTML.escape(part.chargenumber) %]
-     
-      
-      
-      [% HTML.escape(part.bestbefore) %]
-     
-      
-      [% HTML.escape(part.ean) %]
-     [% END %]
-     

-  

-
-  

-   
-  

-
- 

-
-
-
diff --git a/templates/webpages/generic/select_vendor.html b/templates/webpages/generic/select_vendor.html
new file mode 100644
index 000000000..35258df75
--- /dev/null
+++ b/templates/webpages/generic/select_vendor.html
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+  
+
+  
[% title %]

+
+  
+   
+
+   
+
+   
+    
+   
+  
[% 'Please select a vendor from the list below.' | $T8 %]

+
+     
+      
+       
+       [%- FOREACH col = HEADER %]
+       
+       [%- END %]
+      
+
+      [%- FOREACH row = VENDOR %]
+      
+       
+       
+       
+       
+
+
+
+
+      
+      [%- END %]
+     
 [% col.column_title %]

+        
+        
+        [% HTML.escape(name) %]
+       [% HTML.escape(row.customernumber) %][% HTML.escape(row.address) %]

+
+    

+
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/select_vendor_master.html b/templates/webpages/generic/select_vendor_master.html
deleted file mode 100644
index 35258df75..000000000
--- a/templates/webpages/generic/select_vendor_master.html
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-  
-
-  
[% title %]

-
-  
-   
-
-   
-
-   
-    
-   
-  
[% 'Please select a vendor from the list below.' | $T8 %]

-
-     
-      
-       
-       [%- FOREACH col = HEADER %]
-       
-       [%- END %]
-      
-
-      [%- FOREACH row = VENDOR %]
-      
-       
-       
-       
-       
-
-
-
-
-      
-      [%- END %]
-     
 [% col.column_title %]

-        
-        
-        [% HTML.escape(name) %]
-       [% HTML.escape(row.customernumber) %][% HTML.escape(row.address) %]

-
-    

-
- 

-
- 
-
-
-
diff --git a/templates/webpages/generic/set_longdescription.html b/templates/webpages/generic/set_longdescription.html
new file mode 100644
index 000000000..72b50cde1
--- /dev/null
+++ b/templates/webpages/generic/set_longdescription.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
+
+  
[% title %]

+
+  
[% 'Please insert your longdescription below' | $T8 %]

+
+  

+
+  

+ 

+
+ 
+
+
+
diff --git a/templates/webpages/generic/set_longdescription_master.html b/templates/webpages/generic/set_longdescription_master.html
deleted file mode 100644
index 72b50cde1..000000000
--- a/templates/webpages/generic/set_longdescription_master.html
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-
-  
[% title %]

-
-  
[% 'Please insert your longdescription below' | $T8 %]

-
-  

-
-  

- 

-
- 
-
-
-
diff --git a/templates/webpages/generictranslations/edit_greetings.html b/templates/webpages/generictranslations/edit_greetings.html
new file mode 100644
index 000000000..345886acb
--- /dev/null
+++ b/templates/webpages/generictranslations/edit_greetings.html
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+  
[% HTML.escape(title) %]

+ 

+
+ [%- IF message %]
+ 

+  [% HTML.escape(message) %]
+ 

+ [%- END %]
+
+ 

+
+  
+
+   
+    
+    
+    
+   
+
+   [%- FOREACH language = LANGUAGES %]
+   
+    
+    
+    
+   
+   [%- END %]
+
+  
 [% 'male' | $T8 %][% 'female' | $T8 %]

+     [%- IF language.id == 'default' %]
+     [% 'Default (no language selected)' | $T8 %]
+     [%- ELSE %]
+     [%- HTML.escape(language.description) %]
+     [%- END %]
+    

+
+  

+   
+   
+  

+
+ 

+
+
+
diff --git a/templates/webpages/generictranslations/edit_greetings_master.html b/templates/webpages/generictranslations/edit_greetings_master.html
deleted file mode 100644
index 345886acb..000000000
--- a/templates/webpages/generictranslations/edit_greetings_master.html
+++ /dev/null
@@ -1,48 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-  
[% HTML.escape(title) %]

- 

-
- [%- IF message %]
- 

-  [% HTML.escape(message) %]
- 

- [%- END %]
-
- 

-
-  
-
-   
-    
-    
-    
-   
-
-   [%- FOREACH language = LANGUAGES %]
-   
-    
-    
-    
-   
-   [%- END %]
-
-  
 [% 'male' | $T8 %][% 'female' | $T8 %]

-     [%- IF language.id == 'default' %]
-     [% 'Default (no language selected)' | $T8 %]
-     [%- ELSE %]
-     [%- HTML.escape(language.description) %]
-     [%- END %]
-    

-
-  

-   
-   
-  

-
- 

-
-
-
diff --git a/templates/webpages/gl/form_header_chart_balances_js.html b/templates/webpages/gl/form_header_chart_balances_js.html
new file mode 100644
index 000000000..3263ee7cd
--- /dev/null
+++ b/templates/webpages/gl/form_header_chart_balances_js.html
@@ -0,0 +1,28 @@
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE LxERP %]
+
+
diff --git a/templates/webpages/gl/form_header_chart_balances_js_master.html b/templates/webpages/gl/form_header_chart_balances_js_master.html
deleted file mode 100644
index 3263ee7cd..000000000
--- a/templates/webpages/gl/form_header_chart_balances_js_master.html
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-[% USE JavaScript %]
-[% USE LxERP %]
-
-
diff --git a/templates/webpages/gl/generate_report_bottom.html b/templates/webpages/gl/generate_report_bottom.html
new file mode 100644
index 000000000..eb093a004
--- /dev/null
+++ b/templates/webpages/gl/generate_report_bottom.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]

+
+ 
+
+ 
+ 
+ 
+ 
+ 
+
+

diff --git a/templates/webpages/gl/generate_report_bottom_master.html b/templates/webpages/gl/generate_report_bottom_master.html
deleted file mode 100644
index eb093a004..000000000
--- a/templates/webpages/gl/generate_report_bottom_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]

-
- 
-
- 
- 
- 
- 
- 
-
-

diff --git a/templates/webpages/ic/ajax_autocomplete.html b/templates/webpages/ic/ajax_autocomplete.html
new file mode 100644
index 000000000..5bbd3b622
--- /dev/null
+++ b/templates/webpages/ic/ajax_autocomplete.html
@@ -0,0 +1,6 @@
+[%- USE HTML %]
+[%- FOREACH part = parts %]
+[% IF loop.count < limit %]
+[% part.$column %]
+[%- END %]
+[%- END %]
diff --git a/templates/webpages/ic/ajax_autocomplete_master.html b/templates/webpages/ic/ajax_autocomplete_master.html
deleted file mode 100644
index 5bbd3b622..000000000
--- a/templates/webpages/ic/ajax_autocomplete_master.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE HTML %]
-[%- FOREACH part = parts %]
-[% IF loop.count < limit %]
-[% part.$column %]
-[%- END %]
-[%- END %]
diff --git a/templates/webpages/ic/assembly_row.html b/templates/webpages/ic/assembly_row.html
new file mode 100644
index 000000000..c7f8d83d5
--- /dev/null
+++ b/templates/webpages/ic/assembly_row.html
@@ -0,0 +1,35 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+  
+   [% 'Individual Items' | $T8 %]
+  
+  
+   
+    
+     
+[%- FOREACH col = COLUMNS %]
+[%- SET hcol = HEADER.$col %]
+      
+      
+      
+     
+     
+    
[%- LxERP.format_amount(assembly_purchase_price_total, 2) %][%- LxERP.format_amount(assemblytotal, 2) %]

+   
+  
diff --git a/templates/webpages/ic/assembly_row_master.html b/templates/webpages/ic/assembly_row_master.html
deleted file mode 100644
index c7f8d83d5..000000000
--- a/templates/webpages/ic/assembly_row_master.html
+++ /dev/null
@@ -1,35 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-  
-   [% 'Individual Items' | $T8 %]
-  
-  
-   
-    
-     
-[%- FOREACH col = COLUMNS %]
-[%- SET hcol = HEADER.$col %]
-      
-      
-      
-     
-     
-    
[%- LxERP.format_amount(assembly_purchase_price_total, 2) %][%- LxERP.format_amount(assemblytotal, 2) %]

-   
-  
diff --git a/templates/webpages/ic/choice.html b/templates/webpages/ic/choice.html
new file mode 100644
index 000000000..eb625257c
--- /dev/null
+++ b/templates/webpages/ic/choice.html
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+ 

+
+  [%- FOREACH row = HIDDENS %]
+   
+  [%- END %]
+
+  

+   
+    
+     
+     
+    
+    
+     
+     
+    
+   
[% 'Part Number' | $T8 %][% 'Part Description' | $T8 %]

+  

+
+  [%- FOREACH row = PARTS %]
+  
+  
+  
+  
+  
+  [%- END %]
+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/ic/choice_master.html b/templates/webpages/ic/choice_master.html
deleted file mode 100644
index eb625257c..000000000
--- a/templates/webpages/ic/choice_master.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
- 

-
-  [%- FOREACH row = HIDDENS %]
-   
-  [%- END %]
-
-  

-   
-    
-     
-     
-    
-    
-     
-     
-    
-   
[% 'Part Number' | $T8 %][% 'Part Description' | $T8 %]

-  

-
-  [%- FOREACH row = PARTS %]
-  
-  
-  
-  
-  
-  [%- END %]
-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/ic/confirm_price_update.html b/templates/webpages/ic/confirm_price_update.html
new file mode 100644
index 000000000..cc28548fd
--- /dev/null
+++ b/templates/webpages/ic/confirm_price_update.html
@@ -0,0 +1,26 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+ 

+
+  [%- FOREACH row = HIDDENS %]
+  
+  [%- END %]
+
+  
[% 'Confirm!' | $T8 %]

+
+  

+   [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]
+  

+
+  
[% 'Are you sure you want to update the prices' | $T8 %]?

+
+  

+   
+   
+  

+ 

+
+
diff --git a/templates/webpages/ic/confirm_price_update_master.html b/templates/webpages/ic/confirm_price_update_master.html
deleted file mode 100644
index cc28548fd..000000000
--- a/templates/webpages/ic/confirm_price_update_master.html
+++ /dev/null
@@ -1,26 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
- 

-
-  [%- FOREACH row = HIDDENS %]
-  
-  [%- END %]
-
-  
[% 'Confirm!' | $T8 %]

-
-  

-   [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]
-  

-
-  
[% 'Are you sure you want to update the prices' | $T8 %]?

-
-  

-   
-   
-  

- 

-
-
diff --git a/templates/webpages/ic/form_footer.html b/templates/webpages/ic/form_footer.html
new file mode 100644
index 000000000..b91601148
--- /dev/null
+++ b/templates/webpages/ic/form_footer.html
@@ -0,0 +1,93 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  [%- IF item == 'assembly' %]
+  
+  
+  [%- END %]
+
+  
+  
+  
+  
+  
+    

+  
+ 
+
+ 

+
+
+[%- IF CUSTOM_VARIABLES.size %]
+

+
+ 
[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]

+
+ 

+  
+   [%- FOREACH var = CUSTOM_VARIABLES %]
+   
+    
+    
+    
+   
+   [%- END %]
+  
[% var.VALID_BOX %][% HTML.escape(var.description) %][% var.HTML_CODE %]

+ 

+
+ 

+

+[%- END %]
+
+
+
+
+
+
+
+  [%- IF id %]
+    [%- UNLESS previousform %]
+
+    [%- END %]
+
+    [%- IF orphaned %]
+      [%- UNLESS previousform %]
+        [%- IF item == 'assembly' %]
+          [%- UNLESS onhand %]
+
+          [%- END %]
+        [%- ELSE %]
+
+        [%- END %]
+      [%- END %]
+    [%- END %]
+  [%- END %]
+
+  [%- IF id != "" %]
+
+  [%- END %]
+
+
+
+
+
+
+
+
diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
deleted file mode 100644
index b91601148..000000000
--- a/templates/webpages/ic/form_footer_master.html
+++ /dev/null
@@ -1,93 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-  [%- IF item == 'assembly' %]
-  
-  
-  [%- END %]
-
-  
-  
-  
-  
-  
-    

-  
- 
-
- 

-
-
-[%- IF CUSTOM_VARIABLES.size %]
-

-
- 
[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]

-
- 

-  
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   
-    
-    
-    
-   
-   [%- END %]
-  
[% var.VALID_BOX %][% HTML.escape(var.description) %][% var.HTML_CODE %]

- 

-
- 

-

-[%- END %]
-
-
-
-
-
-
-
-  [%- IF id %]
-    [%- UNLESS previousform %]
-
-    [%- END %]
-
-    [%- IF orphaned %]
-      [%- UNLESS previousform %]
-        [%- IF item == 'assembly' %]
-          [%- UNLESS onhand %]
-
-          [%- END %]
-        [%- ELSE %]
-
-        [%- END %]
-      [%- END %]
-    [%- END %]
-  [%- END %]
-
-  [%- IF id != "" %]
-
-  [%- END %]
-
-
-
-
-
-
-
-
diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
new file mode 100644
index 000000000..1063fa50b
--- /dev/null
+++ b/templates/webpages/ic/form_header.html
@@ -0,0 +1,293 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+ 
+ 
+
+ 
[% title %]

+
+ 

+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  

+  

+
+   
+    
+     
+    
+
+
+    [% UNLESS is_service %]
+    
+     
+    
+    [%- END %]
+
+    
diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
deleted file mode 100644
index 1063fa50b..000000000
--- a/templates/webpages/ic/form_header_master.html
+++ /dev/null
@@ -1,293 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
- 
- 
-
- 
[% title %]

-
- 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-
-  

-  

-
-   

+      
+       
+        
+
+        
+       
+      

+         
+          
+           
+          
+
+          
+           
+          
+
+          
+
+          
+           
+          
+         

+            
+             
+              
+              
+             
+             
+              
+              
+             
+             
+               
+               
+             
+             
+              [%- IF all_partsgroup.size %]
+              
+              
+              
+              [% END %]
+             
+
+
+             [%- IF BUCHUNGSGRUPPEN.size %]
+             
+              
+              
+             [%- END %]
+             
+             [%- UNLESS is_assembly %]
+             
+             [%- END %]
+             [%- IF is_part %]
+             
+             [%- END %]
+             
+              
+              
+             
+            
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
+               [%- IF description_area %]
+               
+               [%- ELSE %]
+               
+               [%- END %]
+              
[% 'EAN-Code' | $T8 %]
[% 'Group' | $T8 %]
+               [%- INCLUDE generic/multibox.html
+                     name       = 'partsgroup',
+                     DATA       = all_partsgroup,
+                     show_empty = 1,
+                     id_sub     = 'pg_keys',
+                     label_key  = 'partsgroup',
+                     style      = 'width:250px'
+               -%]
+              
[% 'Buchungsgruppe' | $T8 %]
+               [%- INCLUDE generic/multibox.html
+                     name       = 'buchungsgruppen_id',
+                     DATA       = BUCHUNGSGRUPPEN,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+             
[% 'Payment Terms' | $T8 %]
+               [%- INCLUDE generic/multibox.html
+                     name       = 'payment_id',
+                     DATA       = payment_terms,
+                     show_empty = 1,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+              

+           

+            
+           

+            
+             
+              
+              [%- UNLESS is_service %]
+              
+              [%- END %]
+             
+             
+              
+              [%- UNLESS is_service %]
+              
+              [%- END %]
+             
+            
[% 'Notes' | $T8 %][% 'Formula' | $T8 %]

+               
+              
+               
+                
+                 
+               

+           

+        		
+         
+          
+           
+           
+          
+
+          
+           
+           
+          
+
+          
+           
+           
+          
+
+          [%- UNLESS is_assembly %]
+          
+           
+           
+          
+          [%- END %]
+
+          [%- IF ALL_PRICE_FACTORS.size %]
+          
+           
+           
+          
+          [%- END %]
+
+          
+           
+           
+          
+
+        [%- UNLESS is_service %]
+          
+           
+           
+          
+        [%- END %]
+        [%- UNLESS is_service %]
+          
+           
+           
+          
+          
+           
+           
+          
+          
+           
+           
+          
+          
+           
+           
+          
+          
+           
+           
+          
+          
+           
+           
+          
+        [%- END %]
+        [%- IF id %]
+          
+           
+           
+          
+        [%- END %]
+          
+           
+           
+          
+          
+           
+           
+          
+         
[% 'Updated' | $T8 %]
+            
+           
[% 'List Price' | $T8 %]
[% 'Sell Price' | $T8 %]
[% 'Last Cost' | $T8 %]
[% 'Price Factor' | $T8 %]
+            [%- INCLUDE generic/multibox.html
+                  name       = 'price_factor_id',
+                  DATA       = ALL_PRICE_FACTORS,
+                  show_empty = 1,
+                  id_key     = 'id',
+                  label_key  = 'description',
+                  style      = 'width:100px'
+            -%]
+           
[% 'Unit' | $T8 %]
+            
+            [%- UNLESS unit_changeable %]
+            [% HTML.escape(unit) %]
+            [%- ELSE %]
+            [%- INCLUDE generic/multibox.html
+                  name       = 'unit',
+                  DATA       = ALL_UNITS,
+                  id_key     = 'name',
+                  label_key  = 'name',
+                  style      = 'width:100px'
+            -%]
+            [%- END %]
+           
[% 'Weight' | $T8 %]
+            [%- IF is_assembly %] [% LxERP.format_amount(weight) %][%- END %]
+            
+            [% HTML.escape(defaults.weightunit) %]
+           
[% 'On Hand' | $T8 %] [% LxERP.format_amount(onhand) %]
[% 'ROP' | $T8 %]
[% 'Bin' | $T8 %]
[% 'Verrechnungseinheit' | $T8 %]
[% 'Business Volume' | $T8 %]

+        

+     

+      
+       
+        
+        
+        
+        
+       
+       
+        
+        
+       
+      
[% 'Image' | $T8 %][% 'Microfiche' | $T8 %]
[% 'Drawing' | $T8 %]

+     

-    
-     
-    
-
-
-    [% UNLESS is_service %]
-    
-     
-    
-    [%- END %]
-
-    
diff --git a/templates/webpages/ic/generate_report_bottom.html b/templates/webpages/ic/generate_report_bottom.html
new file mode 100644
index 000000000..17d42afc4
--- /dev/null
+++ b/templates/webpages/ic/generate_report_bottom.html
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+
+ [% SWITCH searchitems %]
+   [% CASE 'part' %][% 'New part' | $T8 %]
+   [% CASE 'service' %][% 'New service' | $T8 %]
+   [% CASE 'assembly' %][% 'New assembly' | $T8 %]
+ [% END %]
+ 

+ 
+
+
diff --git a/templates/webpages/ic/generate_report_bottom_master.html b/templates/webpages/ic/generate_report_bottom_master.html
deleted file mode 100644
index 17d42afc4..000000000
--- a/templates/webpages/ic/generate_report_bottom_master.html
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-
- [% SWITCH searchitems %]
-   [% CASE 'part' %][% 'New part' | $T8 %]
-   [% CASE 'service' %][% 'New service' | $T8 %]
-   [% CASE 'assembly' %][% 'New assembly' | $T8 %]
- [% END %]
- 

- 
-
-
diff --git a/templates/webpages/ic/makemodel.html b/templates/webpages/ic/makemodel.html
new file mode 100644
index 000000000..641212417
--- /dev/null
+++ b/templates/webpages/ic/makemodel.html
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  
+    
+  
+  
diff --git a/templates/webpages/ic/makemodel_master.html b/templates/webpages/ic/makemodel_master.html
deleted file mode 100644
index 641212417..000000000
--- a/templates/webpages/ic/makemodel_master.html
+++ /dev/null
@@ -1,29 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-  
-    
-  
-  
diff --git a/templates/webpages/ic/parts_language_selection.html b/templates/webpages/ic/parts_language_selection.html
new file mode 100644
index 000000000..95ed20d85
--- /dev/null
+++ b/templates/webpages/ic/parts_language_selection.html
@@ -0,0 +1,64 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+  
+
+  
[% title %]

+
+  
[% 'Please insert your language values below' | $T8 %]

+
+  

+   

-      
-       
-        
-
-        
-       
-      

-         
-          
-           
-          
-
-          
-           
-          
-
-          
-
-          
-           
-          
-         

-            
-             
-              
-              
-             
-             
-              
-              
-             
-             
-               
-               
-             
-             
-              [%- IF all_partsgroup.size %]
-              
-              
-              
-              [% END %]
-             
-
-
-             [%- IF BUCHUNGSGRUPPEN.size %]
-             
-              
-              
-             [%- END %]
-             
-             [%- UNLESS is_assembly %]
-             
-             [%- END %]
-             [%- IF is_part %]
-             
-             [%- END %]
-             
-              
-              
-             
-            
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
-               [%- IF description_area %]
-               
-               [%- ELSE %]
-               
-               [%- END %]
-              
[% 'EAN-Code' | $T8 %]
[% 'Group' | $T8 %]
-               [%- INCLUDE generic/multibox.html
-                     name       = 'partsgroup',
-                     DATA       = all_partsgroup,
-                     show_empty = 1,
-                     id_sub     = 'pg_keys',
-                     label_key  = 'partsgroup',
-                     style      = 'width:250px'
-               -%]
-              
[% 'Buchungsgruppe' | $T8 %]
-               [%- INCLUDE generic/multibox.html
-                     name       = 'buchungsgruppen_id',
-                     DATA       = BUCHUNGSGRUPPEN,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-             
[% 'Payment Terms' | $T8 %]
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-              

-           

-            
-           

-            
-             
-              
-              [%- UNLESS is_service %]
-              
-              [%- END %]
-             
-             
-              
-              [%- UNLESS is_service %]
-              
-              [%- END %]
-             
-            
[% 'Notes' | $T8 %][% 'Formula' | $T8 %]

-               
-              
-               
-                
-                 
-               

-           

-        		
-         
-          
-           
-           
-          
-
-          
-           
-           
-          
-
-          
-           
-           
-          
-
-          [%- UNLESS is_assembly %]
-          
-           
-           
-          
-          [%- END %]
-
-          [%- IF ALL_PRICE_FACTORS.size %]
-          
-           
-           
-          
-          [%- END %]
-
-          
-           
-           
-          
-
-        [%- UNLESS is_service %]
-          
-           
-           
-          
-        [%- END %]
-        [%- UNLESS is_service %]
-          
-           
-           
-          
-          
-           
-           
-          
-          
-           
-           
-          
-          
-           
-           
-          
-          
-           
-           
-          
-          
-           
-           
-          
-        [%- END %]
-        [%- IF id %]
-          
-           
-           
-          
-        [%- END %]
-          
-           
-           
-          
-          
-           
-           
-          
-         
[% 'Updated' | $T8 %]
-            
-           
[% 'List Price' | $T8 %]
[% 'Sell Price' | $T8 %]
[% 'Last Cost' | $T8 %]
[% 'Price Factor' | $T8 %]
-            [%- INCLUDE generic/multibox.html
-                  name       = 'price_factor_id',
-                  DATA       = ALL_PRICE_FACTORS,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-                  style      = 'width:100px'
-            -%]
-           
[% 'Unit' | $T8 %]
-            
-            [%- UNLESS unit_changeable %]
-            [% HTML.escape(unit) %]
-            [%- ELSE %]
-            [%- INCLUDE generic/multibox.html
-                  name       = 'unit',
-                  DATA       = ALL_UNITS,
-                  id_key     = 'name',
-                  label_key  = 'name',
-                  style      = 'width:100px'
-            -%]
-            [%- END %]
-           
[% 'Weight' | $T8 %]
-            [%- IF is_assembly %] [% LxERP.format_amount(weight) %][%- END %]
-            
-            [% HTML.escape(defaults.weightunit) %]
-           
[% 'On Hand' | $T8 %] [% LxERP.format_amount(onhand) %]
[% 'ROP' | $T8 %]
[% 'Bin' | $T8 %]
[% 'Verrechnungseinheit' | $T8 %]
[% 'Business Volume' | $T8 %]

-        

-     

-      
-       
-        
-        
-        
-        
-       
-       
-        
-        
-       
-      
[% 'Image' | $T8 %][% 'Microfiche' | $T8 %]
[% 'Drawing' | $T8 %]

-     

+      
+        
+          
+          
+        
+      [%- FOREACH row = MM_DATA %]
+        
+          
+          
+        
+      [%- END %]
+      
[% 'Make' | $T8 %][% 'Model' | $T8 %]

+            [%- INCLUDE generic/multibox.html
+                  name       = "make_$loop.count",
+                  default    = row.make,
+                  DATA       = ALL_VENDORS,
+                  show_empty = 1,
+                  label_key  = 'name',
+                  id_key     = 'id',
+            -%]
+          

+    

-      
-        
-          
-          
-        
-      [%- FOREACH row = MM_DATA %]
-        
-          
-          
-        
-      [%- END %]
-      
[% 'Make' | $T8 %][% 'Model' | $T8 %]

-            [%- INCLUDE generic/multibox.html
-                  name       = "make_$loop.count",
-                  default    = row.make,
-                  DATA       = ALL_VENDORS,
-                  show_empty = 1,
-                  label_key  = 'name',
-                  id_key     = 'id',
-            -%]
-          

-    

+    
+     
+     [%- FOREACH col = HEADER %]
+     
+     [%- END %]
+    
+
+    [%- FOREACH row = LANGUAGES %]
+    
+     
+     
+     
+    
+
+    [%- IF loop.last %]
+    
+    [%- END %]
+    [%- END %]
+   
 [% col.column_title %]
[% HTML.escape(row.description) %]

+  

+
+  

+   
+  

+
+ 
+
+ 
+
+
+
diff --git a/templates/webpages/ic/parts_language_selection_master.html b/templates/webpages/ic/parts_language_selection_master.html
deleted file mode 100644
index 95ed20d85..000000000
--- a/templates/webpages/ic/parts_language_selection_master.html
+++ /dev/null
@@ -1,64 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
-
-  
[% title %]

-
-  
[% 'Please insert your language values below' | $T8 %]

-
-  

-   
-    
-     
-     [%- FOREACH col = HEADER %]
-     
-     [%- END %]
-    
-
-    [%- FOREACH row = LANGUAGES %]
-    
-     
-     
-     
-    
-
-    [%- IF loop.last %]
-    
-    [%- END %]
-    [%- END %]
-   
 [% col.column_title %]
[% HTML.escape(row.description) %]

-  

-
-  

-   
-  

-
- 

-
- 
-
-
-
diff --git a/templates/webpages/ic/price_row.html b/templates/webpages/ic/price_row.html
new file mode 100644
index 000000000..09a7b6e61
--- /dev/null
+++ b/templates/webpages/ic/price_row.html
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- IF PRICES.size %]
+  
+    
+      
+        
+          
+          
+        
+[%- FOREACH row = PRICES %]
+        
+          
+          
+          
+        
+[%- END %]
+      
[% 'Preisklasse' | $T8 %][% 'Preis' | $T8 %]
[% HTML.escape(row.pricegroup) %]

+    
+  
+[%- END %]
diff --git a/templates/webpages/ic/price_row_master.html b/templates/webpages/ic/price_row_master.html
deleted file mode 100644
index 09a7b6e61..000000000
--- a/templates/webpages/ic/price_row_master.html
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- IF PRICES.size %]
-  
-    
-      
-        
-          
-          
-        
-[%- FOREACH row = PRICES %]
-        
-          
-          
-          
-        
-[%- END %]
-      
[% 'Preisklasse' | $T8 %][% 'Preis' | $T8 %]
[% HTML.escape(row.pricegroup) %]

-    
-  
-[%- END %]
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
new file mode 100644
index 000000000..25625a5ec
--- /dev/null
+++ b/templates/webpages/ic/search.html
@@ -0,0 +1,287 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+ 

+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
[% title %]

+
+  
+   
+   
+    
+   
+   
+  

+     
+      
+       
+       
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+       [%- UNLESS is_service %]
+       
+       [%- END %]
+      
+
+      [%- UNLESS is_service %]
+      
+       
+       
+      
+      [%- END %]
+
+      
+       
+       
+       
+       
+      
+
+      [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+      [%- IF is_assembly %]
+      
+       
+       
+      
+      [%- END %]
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+       
+      
+
+      
+       
+      
+     
[% 'Part Number' | $T8 %][% 'EAN' | $T8 %]
[% 'Part Description' | $T8 %]
[% 'Group' | $T8 %][% 'Serial Number' | $T8 %] 
[% 'Make' | $T8 %] [% 'Model' | $T8 %] 
[% 'Drawing' | $T8 %][% 'Microfiche' | $T8 %]

+         
+         
+       

+        
+        
+        [%- UNLESS is_service %]
+        
+        
+        
+        
+        [%- END %]
+        
+        
+        
+        
+       

+        
+         
+          
+
+          
+
+          
+         
+        

+           
+            
+             [%- UNLESS is_assembly %]
+             
+             
+             [%- END %]
+             
+             
+            
+
+            
+             
+            
+
+            
+             [%- UNLESS is_assembly %]
+             
+             
+             [%- END %]
+             
+             
+            
+
+            
+             
+            
+
+            
+             [%- UNLESS is_assembly %]
+             
+             
+             [%- END %]
+             
+             
+            
+           

+          		 
+           
+            
+             
+             
+             
+             
+             
+             
+            
+           
[% 'From' | $T8 %][% 'To (time)' | $T8 %]

+          

+       

+        

+       
[% 'Include in Report' | $T8 %] 
+        
+         
+          
+          
+          [%- UNLESS is_service %]
+          
+          [%- END %]
+          
+         
+
+         
+          
+          
+          
+          
+         
+
+         
+          
+          
+          
+          
+         
+
+         
+          
+          
+          
+          
+         
+
+         
+          
+          
+          
+          
+         
+
+         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+        

+           
+           
+          
+           
+           
+          
+           
+           
+          
+           
+           
+          

+           
+           
+          
+           
+           
+          
+           
+           
+          
+           
+           
+          

+           
+           
+          
+          
+           
+           
+           
+          
+           
+           
+          
+           
+           
+          

+           
+           
+          
+           
+           
+          
+           
+           
+          
+           
+           
+          

+           
+           
+          
+           
+           
+          
+           
+           
+          
+           
+           
+          

+       

+    

+
+  
+
+  

+   
+   
+  

+ 

+
+
+
diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html
deleted file mode 100644
index 25625a5ec..000000000
--- a/templates/webpages/ic/search_master.html
+++ /dev/null
@@ -1,287 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
- 

-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
[% title %]

-
-  
-   
-   
-    
-   
-   
-  

-     
-      
-       
-       
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-       [%- UNLESS is_service %]
-       
-       [%- END %]
-      
-
-      [%- UNLESS is_service %]
-      
-       
-       
-      
-      [%- END %]
-
-      
-       
-       
-       
-       
-      
-
-      [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-      [%- IF is_assembly %]
-      
-       
-       
-      
-      [%- END %]
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-       
-      
-
-      
-       
-      
-     
[% 'Part Number' | $T8 %][% 'EAN' | $T8 %]
[% 'Part Description' | $T8 %]
[% 'Group' | $T8 %][% 'Serial Number' | $T8 %] 
[% 'Make' | $T8 %] [% 'Model' | $T8 %] 
[% 'Drawing' | $T8 %][% 'Microfiche' | $T8 %]

-         
-         
-       

-        
-        
-        [%- UNLESS is_service %]
-        
-        
-        
-        
-        [%- END %]
-        
-        
-        
-        
-       

-        
-         
-          
-
-          
-
-          
-         
-        

-           
-            
-             [%- UNLESS is_assembly %]
-             
-             
-             [%- END %]
-             
-             
-            
-
-            
-             
-            
-
-            
-             [%- UNLESS is_assembly %]
-             
-             
-             [%- END %]
-             
-             
-            
-
-            
-             
-            
-
-            
-             [%- UNLESS is_assembly %]
-             
-             
-             [%- END %]
-             
-             
-            
-           

-          		 
-           
-            
-             
-             
-             
-             
-             
-             
-            
-           
[% 'From' | $T8 %][% 'To (time)' | $T8 %]

-          

-       

-        

-       
[% 'Include in Report' | $T8 %] 
-        
-         
-          
-          
-          [%- UNLESS is_service %]
-          
-          [%- END %]
-          
-         
-
-         
-          
-          
-          
-          
-         
-
-         
-          
-          
-          
-          
-         
-
-         
-          
-          
-          
-          
-         
-
-         
-          
-          
-          
-          
-         
-
-         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-        

-           
-           
-          
-           
-           
-          
-           
-           
-          
-           
-           
-          

-           
-           
-          
-           
-           
-          
-           
-           
-          
-           
-           
-          

-           
-           
-          
-          
-           
-           
-           
-          
-           
-           
-          
-           
-           
-          

-           
-           
-          
-           
-           
-          
-           
-           
-          
-           
-           
-          

-           
-           
-          
-           
-           
-          
-           
-           
-          
-           
-           
-          

-       

-    

-
-  
-
-  

-   
-   
-  

- 

-
-
-
diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
new file mode 100644
index 000000000..a8ce6481d
--- /dev/null
+++ b/templates/webpages/ic/search_update_prices.html
@@ -0,0 +1,118 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+ 

+
+  
+
+  
[% 'Update prices' | $T8 %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+     
+     
+    
+
+    
+     
+     
+    
+   
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
[% 'Group' | $T8 %][% 'Serial Number' | $T8 %]
[% 'Make' | $T8 %][% 'Model' | $T8 %]
[% 'Drawing' | $T8 %][% 'Microfiche' | $T8 %]

+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+     

+  

+
+  

+
+  

+   
+    
+     
+     
+     
+    
+
+    
+     
+     
+     
+    
+
+    
+     
+     
+     
+    
+
+    [%- FOREACH row = PRICE_ROWS %]
+    
+
+    
+     
+     
+     
+    
+    [%- END %]
+
+   
[% 'Preisklasse' | $T8 %][% 'Preis' | $T8 %][% 'Prozentual/Absolut' | $T8 %]
[% 'Sell Price' | $T8 %]
+       /
+      
+     
[% 'List Price' | $T8 %]
+       /
+      
+     
[% HTML.escape(row.pricegroup) %]
+       /
+      
+     

+  

+
+  

+
+  
+  
+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/ic/search_update_prices_master.html b/templates/webpages/ic/search_update_prices_master.html
deleted file mode 100644
index a8ce6481d..000000000
--- a/templates/webpages/ic/search_update_prices_master.html
+++ /dev/null
@@ -1,118 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
- 

-
-  
-
-  
[% 'Update prices' | $T8 %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-     
-     
-    
-
-    
-     
-     
-    
-   
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
[% 'Group' | $T8 %][% 'Serial Number' | $T8 %]
[% 'Make' | $T8 %][% 'Model' | $T8 %]
[% 'Drawing' | $T8 %][% 'Microfiche' | $T8 %]

-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-     

-  

-
-  

-
-  

-   
-    
-     
-     
-     
-    
-
-    
-     
-     
-     
-    
-
-    
-     
-     
-     
-    
-
-    [%- FOREACH row = PRICE_ROWS %]
-    
-
-    
-     
-     
-     
-    
-    [%- END %]
-
-   
[% 'Preisklasse' | $T8 %][% 'Preis' | $T8 %][% 'Prozentual/Absolut' | $T8 %]
[% 'Sell Price' | $T8 %]
-       /
-      
-     
[% 'List Price' | $T8 %]
-       /
-      
-     
[% HTML.escape(row.pricegroup) %]
-       /
-      
-     

-  

-
-  

-
-  
-  
-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
new file mode 100644
index 000000000..179e65d5e
--- /dev/null
+++ b/templates/webpages/ir/_payments.html
@@ -0,0 +1,88 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+  
+   
+    
+     
+[% IF is_type_credit_note %]
+      
+[% ELSE %]
+      
+[%- END %]
+     
+
+
+     
+      
+      
+      
+      
+[% IF show_exchangerate %]
+      
+[% END %]
+      
+     
+
+
+[% FOREACH i = paid_indices %]
+  [% SET datepaid      = 'datepaid_'      _ i %]
+  [% SET source        = 'source_'        _ i %]
+  [% SET memo          = 'memo_'          _ i %]
+  [% SET paid          = 'paid_'          _ i %]
+  [% SET selectAP_paid_ref = 'selectAP_paid_' _ i %]
+
+     
+
+    
+     
+     
+     
+[% IF show_exchangerate %]
+     
+[% END %]
+     
+
+    
+    
+
+[% END # foreach %]
+
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+
+     
+     
+     
+
+     
+    
[% 'Payments' | $T8 %][% 'Incoming Payments' | $T8 %]
[% 'Date' | $T8 %][% 'Source' | $T8 %][% 'Memo' | $T8 %][% 'Amount' | $T8 %][% 'Exch' | $T8 %][% 'Account' | $T8 %]

+      
+      
+     
+  [% SET forex        = 'forex_'        _ i %]
+  [% SET exchangerate = 'exchangerate_' _ i %]
+  [% IF forex %]
+        
+        [% LxERP.format_amount(exchangerate, 2) %]
+  [% ELSE %]
+        
+  [% END %]
+        ;
+     
[% 'Total' | $T8 %][% LxERP.foramt_amount(totalpaid, 2) | html %]
[% 'Missing amount' | $T8 %][% LxERP.format_amount(paid_missing, 2) | html %]

+
+    
+  
diff --git a/templates/webpages/ir/_payments_master.html b/templates/webpages/ir/_payments_master.html
deleted file mode 100644
index 179e65d5e..000000000
--- a/templates/webpages/ir/_payments_master.html
+++ /dev/null
@@ -1,88 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-  
-   
-    
-     
-[% IF is_type_credit_note %]
-      
-[% ELSE %]
-      
-[%- END %]
-     
-
-
-     
-      
-      
-      
-      
-[% IF show_exchangerate %]
-      
-[% END %]
-      
-     
-
-
-[% FOREACH i = paid_indices %]
-  [% SET datepaid      = 'datepaid_'      _ i %]
-  [% SET source        = 'source_'        _ i %]
-  [% SET memo          = 'memo_'          _ i %]
-  [% SET paid          = 'paid_'          _ i %]
-  [% SET selectAP_paid_ref = 'selectAP_paid_' _ i %]
-
-     
-
-    
-     
-     
-     
-[% IF show_exchangerate %]
-     
-[% END %]
-     
-
-    
-    
-
-[% END # foreach %]
-
-    
-      
-      
-      
-      
-    
-    
-      
-      
-      
-      
-    
-
-     
-     
-     
-
-     
-    
[% 'Payments' | $T8 %][% 'Incoming Payments' | $T8 %]
[% 'Date' | $T8 %][% 'Source' | $T8 %][% 'Memo' | $T8 %][% 'Amount' | $T8 %][% 'Exch' | $T8 %][% 'Account' | $T8 %]

-      
-      
-     
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        
-  [% END %]
-        ;
-     
[% 'Total' | $T8 %][% LxERP.foramt_amount(totalpaid, 2) | html %]
[% 'Missing amount' | $T8 %][% LxERP.format_amount(paid_missing, 2) | html %]

-
-    
-  
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
new file mode 100644
index 000000000..9e751783b
--- /dev/null
+++ b/templates/webpages/ir/form_footer.html
@@ -0,0 +1,132 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  
+   
+    
+     
+      
+      
+     
+    

+       
+        
+         
+         
+        
+        
+         
+         
+        
+[%- IF id && follow_ups.size %]
+        
+          
+[%- END %]
+       
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]

+          
+         
+          
+         

+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
+          
+        

+      		
+  [%- IF taxaccounts %]
+       
+       [% 'Tax Included' | $T8 %]
+       

+       

+  [%- END %]
+       
+
+[%- UNLESS taxincluded %]
+        
+         
+         
+       
+[%- END %]
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
+       
+        
+        
+       
+  [%- IF taxincluded %]
+       
+        
+        
+       
+  [%- END %]
+[%- END %]
+
+        
+         
+         
+        
+       
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
Enthaltene [% $description_ref | html %] [% $rate_ref * 100 %]%[% LxERP.format_amount($total_ref, 2) %]
Nettobetrag[% LxERP.format_amount($netto_ref, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

+      

+   
+  
+
+[% PROCESS 'webdav/_list.thml' %]
+
+[% PROCESS 'ir/_payments.html' %]
+
+  
+    

+  
+  
+    
+[% print_options %]
+    
+  
+ 
+
+
+
+  [% IF id %]
+
+    
+[% IF  show_storno %]
+    
+[% END %]
+    
+    
+
+[% IF show_delete %]
+    
+[% END %]
+
+    
+
+ [% ELSE # no id %]
+   [% UNLESS locked %]
+      
+      
+      
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      
+
+      
+  [% END %]
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/webpages/ir/form_footer_master.html b/templates/webpages/ir/form_footer_master.html
deleted file mode 100644
index 9e751783b..000000000
--- a/templates/webpages/ir/form_footer_master.html
+++ /dev/null
@@ -1,132 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-  
-   
-    
-     
-      
-      
-     
-    

-       
-        
-         
-         
-        
-        
-         
-         
-        
-[%- IF id && follow_ups.size %]
-        
-          
-[%- END %]
-       
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]

-          
-         
-          
-         

-            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
-          
-        

-      		
-  [%- IF taxaccounts %]
-       
-       [% 'Tax Included' | $T8 %]
-       

-       

-  [%- END %]
-       
-
-[%- UNLESS taxincluded %]
-        
-         
-         
-       
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       
-        
-        
-       
-  [%- IF taxincluded %]
-       
-        
-        
-       
-  [%- END %]
-[%- END %]
-
-        
-         
-         
-        
-       
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
Enthaltene [% $description_ref | html %] [% $rate_ref * 100 %]%[% LxERP.format_amount($total_ref, 2) %]
Nettobetrag[% LxERP.format_amount($netto_ref, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

-      

-   
-  
-
-[% PROCESS 'webdav/_list.thml' %]
-
-[% PROCESS 'ir/_payments.html' %]
-
-  
-    

-  
-  
-    
-[% print_options %]
-    
-  
- 
-
-
-
-  [% IF id %]
-
-    
-[% IF  show_storno %]
-    
-[% END %]
-    
-    
-
-[% IF show_delete %]
-    
-[% END %]
-
-    
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      
-      
-      
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      
-
-      
-  [% END %]
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
new file mode 100644
index 000000000..c0260e861
--- /dev/null
+++ b/templates/webpages/ir/form_header.html
@@ -0,0 +1,233 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
+
+
+
+
+
+
+
+
+

+
+
[% saved_message %]

+
+[%- FOREACH key = HIDDENS %]
+
+[%- END %]
+
+
+
+
+
+
+
+
[% title %]

+
+
+  
+    
+    
+  
+

+      
+        
+          
+          
+          
+          
+          
+          
+        
+[%- IF ALL_CONTACTS.size %]
+        
+          
+          
+        
+[%- END %]
+        
+          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+  [%- IF id %]
+          
+  [%- END %]
+        
+[%- IF all_departments %]
+        
+          
+          
+        
+[%- END %]
+[%- IF currencies %]
+        
+          
+          
+        
+[%- END %]
+        
+        
+[%- IF show_exchangerate %]
+        
+          
+          
+        
+[%- END %]
+      
[% 'Vendor' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'vendor',
+                 style         = 'width: 250px',
+                 DATA          = ALL_VENDORS,
+                 id_sub        = 'vc_keys',
+                 label_key     = 'name',
+                 select        = vc_select,
+                 limit         = vclimit,
+                 allow_textbox = 1,
+                 onChange      = "document.getElementById('update_button').click();" -%]
+            
+          
[% 'Contact Person' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'cp_id',
+                 style      = 'width: 250px',
+                 DATA       = ALL_CONTACTS,
+                 id_key     = 'cp_id',
+                 label_sub  = 'contact_labels',
+                 show_empty = 1 -%]
+          
[% 'Credit Limit' | $T8 %]
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
+            [% LxERP.format_amount(creditremaining,0 ,'0') %]
+          
[% 'Record in' | $T8 %]
[% 'Steuersatz' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'taxzone_id'
+                 style      = 'width: 250px'
+                 DATA       = ALL_TAXZONES
+                 id_key     = 'id'
+                 readonly   = (id ? 1 : 0)
+                 label_key  = 'description' -%]
+          
[% 'Department' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'department_id',
+                 style      = 'width: 250px',
+                 DATA       = all_departments,
+                 id_key     = 'id',
+                 label_sub  = 'department_labels',
+                 show_empty = 1 -%]
+          
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
+           [%- IF forex %]
+            [% LxERP.format_amount(exchangerate, 2) %]
+           [%- ELSE %]
+            
+           [%- END %]
+          

+    		
+      
+        
+          
+          
+        
+
+[%- IF is_type_credit_note %]
+        
+          
+          
+        
+        
+          
+          
+        
+[%- ELSE %]
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+[%- END %]
+
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+      
[% 'Employee' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'employee_id',
+                 DATA       = ALL_EMPLOYEES,
+                 id_key     = 'id',
+                 label_sub  = 'sales_employee_labels' -%]
+          
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %]
+            
+            
+          
[% 'Invoice Number' | $T8 %]
[% 'Invoice Date' | $T8 %]
+            
+            
+          
[% 'Due Date' | $T8 %]
+            
+            
+          
[% 'Order Number' | $T8 %]
[% 'Order Date' | $T8 %]
+          
[% 'Quotation Date' | $T8 %]
+           
[% 'Project Number' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'globalproject_id',
+                 DATA       = ALL_PROJECTS,
+                 id_key     = 'id',
+                 label_key  = 'projectnumber',
+                 show_empty = 1,
+                 onChange   = "document.getElementById('update_button').click();" -%]
+          

+    

+    
+  
+  
+    
+    
+  
+  
+  
+  
+  
+
+  
diff --git a/templates/webpages/ir/form_header_master.html b/templates/webpages/ir/form_header_master.html
deleted file mode 100644
index c0260e861..000000000
--- a/templates/webpages/ir/form_header_master.html
+++ /dev/null
@@ -1,233 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
-
-
-
-
-
-
-
-
-
-
-
[% saved_message %]

-
-[%- FOREACH key = HIDDENS %]
-
-[%- END %]
-
-
-
-
-
-
-
-
[% title %]

-
-
-  
-    
-    
-  
-

-      
-        
-          
-          
-          
-          
-          
-          
-        
-[%- IF ALL_CONTACTS.size %]
-        
-          
-          
-        
-[%- END %]
-        
-          
-          
-        
-        
-          
-          
-          
-        
-        
-          
-          
-  [%- IF id %]
-          
-  [%- END %]
-        
-[%- IF all_departments %]
-        
-          
-          
-        
-[%- END %]
-[%- IF currencies %]
-        
-          
-          
-        
-[%- END %]
-        
-        
-[%- IF show_exchangerate %]
-        
-          
-          
-        
-[%- END %]
-      
[% 'Vendor' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'vendor',
-                 style         = 'width: 250px',
-                 DATA          = ALL_VENDORS,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 allow_textbox = 1,
-                 onChange      = "document.getElementById('update_button').click();" -%]
-            
-          
[% 'Contact Person' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          
[% 'Credit Limit' | $T8 %]
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
-            [% LxERP.format_amount(creditremaining,0 ,'0') %]
-          
[% 'Record in' | $T8 %]
[% 'Steuersatz' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 style      = 'width: 250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          
[% 'Department' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            
-           [%- END %]
-          

-    		
-      
-        
-          
-          
-        
-
-[%- IF is_type_credit_note %]
-        
-          
-          
-        
-        
-          
-          
-        
-[%- ELSE %]
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-[%- END %]
-
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-      
[% 'Employee' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %]
-            
-            
-          
[% 'Invoice Number' | $T8 %]
[% 'Invoice Date' | $T8 %]
-            
-            
-          
[% 'Due Date' | $T8 %]
-            
-            
-          
[% 'Order Number' | $T8 %]
[% 'Order Date' | $T8 %]
-          
[% 'Quotation Date' | $T8 %]
-           
[% 'Project Number' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'globalproject_id',
-                 DATA       = ALL_PROJECTS,
-                 id_key     = 'id',
-                 label_key  = 'projectnumber',
-                 show_empty = 1,
-                 onChange   = "document.getElementById('update_button').click();" -%]
-          

-    

-    
-  
-  
-    
-    
-  
-  
-  
-  
-  
-
-  
diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
new file mode 100644
index 000000000..1c39b20e3
--- /dev/null
+++ b/templates/webpages/is/_payments.html
@@ -0,0 +1,87 @@
+[%- USE LxERP %][% USE T8 %]
+  
+   
+    
+     
+[% IF is_type_credit_note %]
+      
+[% ELSE %]
+      
+[%- END %]
+     
+
+
+     
+      
+      
+      
+      
+[% IF show_exchangerate %]
+      
+[% END %]
+      
+     
+
+
+[% FOREACH i = paid_indices %]
+  [% SET datepaid      = 'datepaid_'      _ i %]
+  [% SET source        = 'source_'        _ i %]
+  [% SET memo          = 'memo_'          _ i %]
+  [% SET paid          = 'paid_'          _ i %]
+  [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %]
+
+     
+
+    
+     
+     
+     
+[% IF show_exchangerate %]
+     
+[% END %]
+     
+
+    
+    
+
+[% END # foreach %]
+
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+
+     
+     
+     
+
+     
+    
[%- 'Payments' | $T8 %][%- 'Incoming Payments' | $T8 %]
[%- 'Date' | $T8 %][%- 'Source' | $T8 %][%- 'Memo' | $T8 %][%- 'Amount' | $T8 %][%- 'Exch' | $T8 %][%- 'Account' | $T8 %]

+      
+      
+     
+  [% SET forex        = 'forex_'        _ i %]
+  [% SET exchangerate = 'exchangerate_' _ i %]
+  [% IF forex %]
+        
+        [% LxERP.format_amount(exchangerate, 2) %]
+  [% ELSE %]
+        
+  [% END %]
+        ;
+     
[%- 'Total' | $T8 %][% LxERP.foramt_amount(totalpaid, 2) | html %]
[%- 'Missing amount' | $T8 %][% LxERP.format_amount(paid_missing, 2) | html %]

+
+    
+  
diff --git a/templates/webpages/is/_payments_master.html b/templates/webpages/is/_payments_master.html
deleted file mode 100644
index 1c39b20e3..000000000
--- a/templates/webpages/is/_payments_master.html
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %][% USE T8 %]
-  
-   
-    
-     
-[% IF is_type_credit_note %]
-      
-[% ELSE %]
-      
-[%- END %]
-     
-
-
-     
-      
-      
-      
-      
-[% IF show_exchangerate %]
-      
-[% END %]
-      
-     
-
-
-[% FOREACH i = paid_indices %]
-  [% SET datepaid      = 'datepaid_'      _ i %]
-  [% SET source        = 'source_'        _ i %]
-  [% SET memo          = 'memo_'          _ i %]
-  [% SET paid          = 'paid_'          _ i %]
-  [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %]
-
-     
-
-    
-     
-     
-     
-[% IF show_exchangerate %]
-     
-[% END %]
-     
-
-    
-    
-
-[% END # foreach %]
-
-    
-      
-      
-      
-      
-    
-    
-      
-      
-      
-      
-    
-
-     
-     
-     
-
-     
-    
[%- 'Payments' | $T8 %][%- 'Incoming Payments' | $T8 %]
[%- 'Date' | $T8 %][%- 'Source' | $T8 %][%- 'Memo' | $T8 %][%- 'Amount' | $T8 %][%- 'Exch' | $T8 %][%- 'Account' | $T8 %]

-      
-      
-     
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        
-  [% END %]
-        ;
-     
[%- 'Total' | $T8 %][% LxERP.foramt_amount(totalpaid, 2) | html %]
[%- 'Missing amount' | $T8 %][% LxERP.format_amount(paid_missing, 2) | html %]

-
-    
-  
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
new file mode 100644
index 000000000..314e65af9
--- /dev/null
+++ b/templates/webpages/is/form_footer.html
@@ -0,0 +1,175 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  
+   
+    
+     
+      
+      
+      
+     
+    

+       
+        
+         
+         
+         
+        
+        
+         
+         
+         
+        
+[%- IF id && follow_ups.size %]
+        
+          
+[%- END %]
+       
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %][% 'Payment Terms' | $T8 %]

+          
+         
+          
+         
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'payment_id',
+                 style         = 'width: 250px',
+                 DATA          = payment_terms,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1
+                 allow_textbox = 0 -%]
+          
+         

+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
+          
+        

+      		
+       
+        
+         
+         
+        
+        
+         
+         
+        
+        
+        
+       
[% 'Ertrag' | $T8 %][% LxERP.format_amount(marge_total, 2, 0) %]
[% 'Ertrag prozentual' | $T8 %][% LxERP.format_amount(marge_percent, 2, 0) %] %

+      		
+  [%- IF taxaccounts %]
+       
+       [% 'Tax Included' | $T8 %]
+       

+       

+  [%- END %]
+       
+
+[%- UNLESS taxincluded %]
+        
+         
+         
+       
+[%- END %]
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
+       
+        
+        
+       
+  [%- IF taxincluded %]
+       
+        
+        
+       
+  [%- END %]
+[%- END %]
+
+        
+         
+         
+        
+       
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
Enthaltene [% $description_ref | html %] [% $rate_ref * 100 %]%[% LxERP.format_amount($total_ref, 2) %]
Nettobetrag[% LxERP.format_amount($netto_ref, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

+      

+   
+  
+
+[% PROCESS 'webdav/_list.html' %]
+
+[% PROCESS 'is/_payments.html' %]
+
+  
+    

+  
+  
+    
+[% print_options %]
+    
+  
+ 
+
+
+
+  [% IF id %]
+
+    
+    
+    
+    
+[% IF  show_storno %]
+    
+[% END %]
+    
+    
+
+[% IF id && !is_type_credit_note %]
+    
+[% END %]
+[% IF show_delete %]
+    
+    
+[% END %]
+
+  [%- UNLESS locked %]
+       
+  [%- END %]
+
+    
+
+ [% ELSE # no id %]
+   [% UNLESS locked %]
+      
+      
+      
+      
+      
+      
+      
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      
+
+      
+  [% END %]
+
+
+
+
+
+
+
+

+
+
+
+
diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
deleted file mode 100644
index 314e65af9..000000000
--- a/templates/webpages/is/form_footer_master.html
+++ /dev/null
@@ -1,175 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-  
-   
-    
-     
-      
-      
-      
-     
-    

-       
-        
-         
-         
-         
-        
-        
-         
-         
-         
-        
-[%- IF id && follow_ups.size %]
-        
-          
-[%- END %]
-       
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %][% 'Payment Terms' | $T8 %]

-          
-         
-          
-         
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'payment_id',
-                 style         = 'width: 250px',
-                 DATA          = payment_terms,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1
-                 allow_textbox = 0 -%]
-          
-         

-            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
-          
-        

-      		
-       
-        
-         
-         
-        
-        
-         
-         
-        
-        
-        
-       
[% 'Ertrag' | $T8 %][% LxERP.format_amount(marge_total, 2, 0) %]
[% 'Ertrag prozentual' | $T8 %][% LxERP.format_amount(marge_percent, 2, 0) %] %

-      		
-  [%- IF taxaccounts %]
-       
-       [% 'Tax Included' | $T8 %]
-       

-       

-  [%- END %]
-       
-
-[%- UNLESS taxincluded %]
-        
-         
-         
-       
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       
-        
-        
-       
-  [%- IF taxincluded %]
-       
-        
-        
-       
-  [%- END %]
-[%- END %]
-
-        
-         
-         
-        
-       
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
Enthaltene [% $description_ref | html %] [% $rate_ref * 100 %]%[% LxERP.format_amount($total_ref, 2) %]
Nettobetrag[% LxERP.format_amount($netto_ref, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

-      

-   
-  
-
-[% PROCESS 'webdav/_list.html' %]
-
-[% PROCESS 'is/_payments.html' %]
-
-  
-    

-  
-  
-    
-[% print_options %]
-    
-  
- 
-
-
-
-  [% IF id %]
-
-    
-    
-    
-    
-[% IF  show_storno %]
-    
-[% END %]
-    
-    
-
-[% IF id && !is_type_credit_note %]
-    
-[% END %]
-[% IF show_delete %]
-    
-    
-[% END %]
-
-  [%- UNLESS locked %]
-       
-  [%- END %]
-
-    
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      
-      
-      
-      
-      
-      
-      
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      
-
-      
-  [% END %]
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
new file mode 100644
index 000000000..059541339
--- /dev/null
+++ b/templates/webpages/is/form_header.html
@@ -0,0 +1,315 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
+
+
+
+
+
+
+
+
+

+
+
[% saved_message %]

+
+[%- FOREACH key = HIDDENS %]
+
+[%- END %]
+
+
+
+
+
+
+
+
[% title %]

+
+
+  
+    
+    
+  
+

+      
+        
+          
+          
+          
+          
+          
+          
+        
+[%- IF ALL_CONTACTS.size %]
+        
+          
+          
+        
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+        
+          
+          
+        
+[%- END %]
+        
+          
+          
+        
+[%- IF max_dunning_level %]
+        
+          
+          
+        
+[%- END %]
+[%- IF business %]
+        
+          
+          
+        
+[%- END %]
+        
+          
+          
+          
+        
+        
+          
+          
+  [%- IF id %]
+          
+  [%- END %]
+        
+[%- IF all_departments %]
+        
+          
+          
+        
+[%- END %]
+[%- IF currencies %]
+        
+          
+          
+        
+[%- END %]
+        
+        
+[%- IF show_exchangerate %]
+        
+          
+          
+        
+[%- END %]
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+      
[% 'Customer' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'customer',
+                 style         = 'width: 250px',
+                 DATA          = ALL_CUSTOMERS,
+                 id_sub        = 'vc_keys',
+                 label_key     = 'name',
+                 select        = vc_select,
+                 limit         = vclimit,
+                 allow_textbox = 1,
+                 onChange      = "document.getElementById('update_button').click();" -%]
+            
+          
[% 'Contact Person' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'cp_id',
+                 style      = 'width: 250px',
+                 DATA       = ALL_CONTACTS,
+                 id_key     = 'cp_id',
+                 label_sub  = 'contact_labels',
+                 show_empty = 1 -%]
+          
[% 'Shipping Address' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'shipto_id',
+                 style      = 'width: 250px',
+                 DATA       = ALL_SHIPTO,
+                 id_key     = 'shipto_id',
+                 label_sub  = 'shipto_labels',
+                 show_empty = 1,
+                 onChange   = "document.getElementById('update_button').click();" -%]
+          
[% 'Credit Limit' | $T8 %]
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
+            [% LxERP.format_amount(creditremaining,0 ,'0') %]
+          
[% 'Max. Dunning Level' | $T8 %]:
+            [% max_dunning_level %]; [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount,2) %]
+          
[% 'Customer type' | $T8 %][% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %
[% 'Record in' | $T8 %]
[% 'Steuersatz' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'taxzone_id'
+                 stype      = '250px'
+                 DATA       = ALL_TAXZONES
+                 id_key     = 'id'
+                 readonly   = (id ? 1 : 0)
+                 label_key  = 'description' -%]
+          
[% 'Department' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'department_id',
+                 style      = 'width: 250px',
+                 DATA       = all_departments,
+                 id_key     = 'id',
+                 label_sub  = 'department_labels',
+                 show_empty = 1 -%]
+          
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
+           [%- IF forex %]
+            [% LxERP.format_amount(exchangerate, 2) %]
+           [%- ELSE %]
+            
+           [%- END %]
+          
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

+    		
+      
+        
+          
+          
+        
+[%- IF ALL_SALESMEN.size %]
+        
+          
+          
+        
+[%- END %]
+
+[%- IF is_type_credit_note %]
+        
+          
+          
+        
+        
+          
+          
+        
+[%- ELSE %]
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+        
+          
+        
+        
+          
+            
+        
+[%- END %]
+
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+      
[% 'Employee' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'employee_id',
+                 DATA       = ALL_EMPLOYEES,
+                 id_key     = 'id',
+                 label_sub  = 'sales_employee_labels' -%]
+          
[% 'Salesman' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'salesman_id',
+                 default    = salesman_id ? salesman_id : employee_id,
+                 DATA       = ALL_SALESMEN,
+                 id_key     = 'id',
+                 label_sub  = 'sales_employee_labels' -%]
+          
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %]
+            
+            
+          
[% 'Invoice Number' | $T8 %]
[% 'Invoice Date' | $T8 %]
+            
+            
+          
[% 'Due Date' | $T8 %]
+            
+            
+          
[% 'Delivery Order Number' | $T8 %]
[% 'Delivery Date' | $T8 %]
+              
+              
+            
[% 'Order Number' | $T8 %]
[% 'Order Date' | $T8 %]
+          
[% 'Quotation Number' | $T8 %]
[% 'Quotation Date' | $T8 %]
+           
[% 'Customer Order Number' | $T8 %]
[% 'Project Number' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'globalproject_id',
+                 DATA       = ALL_PROJECTS,
+                 id_key     = 'id',
+                 label_key  = 'projectnumber',
+                 show_empty = 1,
+                 onChange   = "document.getElementById('update_button').click();" -%]
+          

+    

+    
+  
+  
+    
+    
+  
+  
+  
+  
+  
+
+  
diff --git a/templates/webpages/is/form_header_master.html b/templates/webpages/is/form_header_master.html
deleted file mode 100644
index 059541339..000000000
--- a/templates/webpages/is/form_header_master.html
+++ /dev/null
@@ -1,315 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
-
-
-
-
-
-
-
-
-
-
-
[% saved_message %]

-
-[%- FOREACH key = HIDDENS %]
-
-[%- END %]
-
-
-
-
-
-
-
-
[% title %]

-
-
-  
-    
-    
-  
-

-      
-        
-          
-          
-          
-          
-          
-          
-        
-[%- IF ALL_CONTACTS.size %]
-        
-          
-          
-        
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-        
-          
-          
-        
-[%- END %]
-        
-          
-          
-        
-[%- IF max_dunning_level %]
-        
-          
-          
-        
-[%- END %]
-[%- IF business %]
-        
-          
-          
-        
-[%- END %]
-        
-          
-          
-          
-        
-        
-          
-          
-  [%- IF id %]
-          
-  [%- END %]
-        
-[%- IF all_departments %]
-        
-          
-          
-        
-[%- END %]
-[%- IF currencies %]
-        
-          
-          
-        
-[%- END %]
-        
-        
-[%- IF show_exchangerate %]
-        
-          
-          
-        
-[%- END %]
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-      
[% 'Customer' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'customer',
-                 style         = 'width: 250px',
-                 DATA          = ALL_CUSTOMERS,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 allow_textbox = 1,
-                 onChange      = "document.getElementById('update_button').click();" -%]
-            
-          
[% 'Contact Person' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          
[% 'Shipping Address' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'shipto_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_SHIPTO,
-                 id_key     = 'shipto_id',
-                 label_sub  = 'shipto_labels',
-                 show_empty = 1,
-                 onChange   = "document.getElementById('update_button').click();" -%]
-          
[% 'Credit Limit' | $T8 %]
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
-            [% LxERP.format_amount(creditremaining,0 ,'0') %]
-          
[% 'Max. Dunning Level' | $T8 %]:
-            [% max_dunning_level %]; [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount,2) %]
-          
[% 'Customer type' | $T8 %][% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %
[% 'Record in' | $T8 %]
[% 'Steuersatz' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 stype      = '250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          
[% 'Department' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            
-           [%- END %]
-          
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

-    		
-      
-        
-          
-          
-        
-[%- IF ALL_SALESMEN.size %]
-        
-          
-          
-        
-[%- END %]
-
-[%- IF is_type_credit_note %]
-        
-          
-          
-        
-        
-          
-          
-        
-[%- ELSE %]
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-        
-          
-        
-        
-          
-            
-        
-[%- END %]
-
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-      
[% 'Employee' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          
[% 'Salesman' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'salesman_id',
-                 default    = salesman_id ? salesman_id : employee_id,
-                 DATA       = ALL_SALESMEN,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %]
-            
-            
-          
[% 'Invoice Number' | $T8 %]
[% 'Invoice Date' | $T8 %]
-            
-            
-          
[% 'Due Date' | $T8 %]
-            
-            
-          
[% 'Delivery Order Number' | $T8 %]
[% 'Delivery Date' | $T8 %]
-              
-              
-            
[% 'Order Number' | $T8 %]
[% 'Order Date' | $T8 %]
-          
[% 'Quotation Number' | $T8 %]
[% 'Quotation Date' | $T8 %]
-           
[% 'Customer Order Number' | $T8 %]
[% 'Project Number' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'globalproject_id',
-                 DATA       = ALL_PROJECTS,
-                 id_key     = 'id',
-                 label_key  = 'projectnumber',
-                 show_empty = 1,
-                 onChange   = "document.getElementById('update_button').click();" -%]
-          

-    

-    
-  
-  
-    
-    
-  
-  
-  
-  
-  
-
-  
diff --git a/templates/webpages/login/auth_db_unreachable.html b/templates/webpages/login/auth_db_unreachable.html
new file mode 100644
index 000000000..bc3e11b44
--- /dev/null
+++ b/templates/webpages/login/auth_db_unreachable.html
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+
+
+ 
[% 'Error!' | $T8 %]

+
+ 
[%- 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]

+
+ 
[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]

+
+ 

+  [% 'Login' | $T8 %] |
+  [% 'Administration' | $T8 %]
+ 

+
+
+
diff --git a/templates/webpages/login/auth_db_unreachable_master.html b/templates/webpages/login/auth_db_unreachable_master.html
deleted file mode 100644
index bc3e11b44..000000000
--- a/templates/webpages/login/auth_db_unreachable_master.html
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- USE T8 %]
-
-
- 
[% 'Error!' | $T8 %]

-
- 
[%- 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]

-
- 
[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]

-
- 

-  [% 'Login' | $T8 %] |
-  [% 'Administration' | $T8 %]
- 

-
-
-
diff --git a/templates/webpages/login/authentication_pl_missing.html b/templates/webpages/login/authentication_pl_missing.html
new file mode 100644
index 000000000..e9530b09f
--- /dev/null
+++ b/templates/webpages/login/authentication_pl_missing.html
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+
+
+ 
[% 'Error!' | $T8 %]

+
+ 
[% 'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]

+
+ 
[% 'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' | $T8 %]

+
+ 

+  [% 'Login' | $T8 %] |
+  [% 'Administration' | $T8 %]
+ 

+
+
+
diff --git a/templates/webpages/login/authentication_pl_missing_master.html b/templates/webpages/login/authentication_pl_missing_master.html
deleted file mode 100644
index e9530b09f..000000000
--- a/templates/webpages/login/authentication_pl_missing_master.html
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- USE T8 %]
-
-
- 
[% 'Error!' | $T8 %]

-
- 
[% 'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]

-
- 
[% 'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' | $T8 %]

-
- 

-  [% 'Login' | $T8 %] |
-  [% 'Administration' | $T8 %]
- 

-
-
-
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
new file mode 100644
index 000000000..a30645605
--- /dev/null
+++ b/templates/webpages/login/company_logo.html
@@ -0,0 +1,54 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+ [%- DEFAULT myconfig_dbhost = 'localhost' %]
+
+ 

+  
+
+  
+
+  
[% 'Licensed to' | $T8 %]

+
+  

+   
+    [% HTML.escape(myconfig_company) %]
+    

+    [% HTML.escape(myconfig_address).replace('\\\\n', '
').replace('\n', '
') %]
+   
+
+   

+
+   
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+    
+    
+    
+    
+    
+     
+    
+   
[% 'User' | $T8 %][% HTML.escape(myconfig_name) %]
[% 'Dataset' | $T8 %][% HTML.escape(myconfig_dbname) %]
[% 'Database Host' | $T8 %][% HTML.escape(myconfig_dbhost) %]
http://lx-office.org

+
+   
+ 

+
+ [%- todo_list %]
+
+
+
diff --git a/templates/webpages/login/company_logo_master.html b/templates/webpages/login/company_logo_master.html
deleted file mode 100644
index a30645605..000000000
--- a/templates/webpages/login/company_logo_master.html
+++ /dev/null
@@ -1,54 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
- [%- DEFAULT myconfig_dbhost = 'localhost' %]
-
- 

-  
-
-  
-
-  
[% 'Licensed to' | $T8 %]

-
-  

-   
-    [% HTML.escape(myconfig_company) %]
-    

-    [% HTML.escape(myconfig_address).replace('\\\\n', '
').replace('\n', '
') %]
-   
-
-   

-
-   
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-    
-    
-    
-    
-    
-     
-    
-   
[% 'User' | $T8 %][% HTML.escape(myconfig_name) %]
[% 'Dataset' | $T8 %][% HTML.escape(myconfig_dbname) %]
[% 'Database Host' | $T8 %][% HTML.escape(myconfig_dbhost) %]
http://lx-office.org

-
-   
- 

-
- [%- todo_list %]
-
-
-
diff --git a/templates/webpages/login/login_screen.html b/templates/webpages/login/login_screen.html
new file mode 100644
index 000000000..1c421fb96
--- /dev/null
+++ b/templates/webpages/login/login_screen.html
@@ -0,0 +1,49 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+  
+   
+    
+   
+  
+
+
+
diff --git a/templates/webpages/login/login_screen_master.html b/templates/webpages/login/login_screen_master.html
deleted file mode 100644
index 1c421fb96..000000000
--- a/templates/webpages/login/login_screen_master.html
+++ /dev/null
@@ -1,49 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-  
-   
-    
-   
-  
-
-
-
diff --git a/templates/webpages/login/password_error.html b/templates/webpages/login/password_error.html
new file mode 100644
index 000000000..e1060a015
--- /dev/null
+++ b/templates/webpages/login/password_error.html
@@ -0,0 +1,11 @@
+[%- USE T8 %]
+
+
+ 
[% 'Error!' | $T8 %]

+
+ 
[% error %]

+
+ 
[% 'Login' | $T8 %]

+
+
+
diff --git a/templates/webpages/login/password_error_master.html b/templates/webpages/login/password_error_master.html
deleted file mode 100644
index e1060a015..000000000
--- a/templates/webpages/login/password_error_master.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[%- USE T8 %]
-
-
- 
[% 'Error!' | $T8 %]

-
- 
[% error %]

-
- 
[% 'Login' | $T8 %]

-
-
-
diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
new file mode 100644
index 000000000..89a897eee
--- /dev/null
+++ b/templates/webpages/menu/menunew.html
@@ -0,0 +1,103 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+
+ 
+  
+   
+   
+  
+ 

+     
+    [[% 'new Window' | $T8 %]]
+     
+    [[% 'print' | $T8 %]]
+   
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [% 'logout' | $T8 %]]
+    [% date %]  
+   

+
+ 
+
+ [%- SET main_id = '100' %]
+ 
+       [%- END %]
+      
+     [%- END %]
+    
+   [%- END %]
+  
+ [%- END %]
+ 
+
+ 
+
+ 
+
+
diff --git a/templates/webpages/menu/menunew_master.html b/templates/webpages/menu/menunew_master.html
deleted file mode 100644
index 89a897eee..000000000
--- a/templates/webpages/menu/menunew_master.html
+++ /dev/null
@@ -1,103 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-
- 
-  
-   
-   
-  
- 

-     
-    [[% 'new Window' | $T8 %]]
-     
-    [[% 'print' | $T8 %]]
-   
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
-    [% 'logout' | $T8 %]]
-    [% date %]  
-   

-
- 
-
- [%- SET main_id = '100' %]
- 
-       [%- END %]
-      
-     [%- END %]
-    
-   [%- END %]
-  
- [%- END %]
- 
-
- 
-
- 
-
-
diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
new file mode 100644
index 000000000..9da62367c
--- /dev/null
+++ b/templates/webpages/menu/menuv3.html
@@ -0,0 +1,46 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+  
+   
+   
+  
+ 

+     
+    [[% 'new Window' | $T8 %]]
+     
+    [[% 'print' | $T8 %]]
+   
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [% 'logout' | $T8 %]]
+    [% date %]  
+   

+
+
+ 
+
+ 

+
+ 
+
+
diff --git a/templates/webpages/menu/menuv3_master.html b/templates/webpages/menu/menuv3_master.html
deleted file mode 100644
index 9da62367c..000000000
--- a/templates/webpages/menu/menuv3_master.html
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-  
-   
-   
-  
- 

-     
-    [[% 'new Window' | $T8 %]]
-     
-    [[% 'print' | $T8 %]]
-   
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
-    [% 'logout' | $T8 %]]
-    [% date %]  
-   

-
-
- 
-
- 

-
- 
-
-
diff --git a/templates/webpages/menu/menuv4.html b/templates/webpages/menu/menuv4.html
new file mode 100644
index 000000000..4ae7d19a9
--- /dev/null
+++ b/templates/webpages/menu/menuv4.html
@@ -0,0 +1,46 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+  
+   
+   
+  
+ 

+     
+    [[% 'new Window' | $T8 %]]
+     
+    [[% 'print' | $T8 %]]
+   
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [% 'logout' | $T8 %]]
+    [% date %]  
+   

+
+
+ 
+
+ 

+
+ 
+
+
diff --git a/templates/webpages/menu/menuv4_master.html b/templates/webpages/menu/menuv4_master.html
deleted file mode 100644
index 4ae7d19a9..000000000
--- a/templates/webpages/menu/menuv4_master.html
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-  
-   
-   
-  
- 

-     
-    [[% 'new Window' | $T8 %]]
-     
-    [[% 'print' | $T8 %]]
-   
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
-    [% 'logout' | $T8 %]]
-    [% date %]  
-   

-
-
- 
-
- 

-
- 
-
-
diff --git a/templates/webpages/oe/check_for_direct_delivery.html b/templates/webpages/oe/check_for_direct_delivery.html
new file mode 100644
index 000000000..35a5135ff
--- /dev/null
+++ b/templates/webpages/oe/check_for_direct_delivery.html
@@ -0,0 +1,87 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% 'Carry over shipping address' | $T8 %]

+
+ 
[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]

+
+ 

+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+  
[% 'Name' | $T8 %]:[% HTML.escape(CFDD_shiptoname) %]
[% 'Department' | $T8 %]:[% HTML.escape(CFDD_shiptodepartment_1) %]
 [% HTML.escape(CFDD_shiptodepartment_2) %]
[% 'Street' | $T8 %]:[% HTML.escape(CFDD_shiptostreet) %]
[% 'Zipcode' | $T8 %]:[% HTML.escape(CFDD_shiptozipcode) %]
[% 'City' | $T8 %]:[% HTML.escape(CFDD_shiptocity) %]
[% 'Country' | $T8 %]:[% HTML.escape(CFDD_shiptocountry) %]
[% 'Contact' | $T8 %]:[% HTML.escape(CFDD_shiptocontact) %]
[% 'Phone' | $T8 %]:[% HTML.escape(CFDD_shiptophone) %]
[% 'Fax' | $T8 %]:[% HTML.escape(CFDD_shiptofax) %]
[% 'E-mail' | $T8 %]:[% HTML.escape(CFDD_shiptoemail) %]

+ 

+
+  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
+ 

+
+ 

+
+  

+    
+   
+  

+
+  
+  
+
+  [%- FOREACH row = VARIABLES %]
+  
+  [%- END %]
+
+ 

+
+
+
diff --git a/templates/webpages/oe/check_for_direct_delivery_master.html b/templates/webpages/oe/check_for_direct_delivery_master.html
deleted file mode 100644
index 35a5135ff..000000000
--- a/templates/webpages/oe/check_for_direct_delivery_master.html
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% 'Carry over shipping address' | $T8 %]

-
- 
[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]

-
- 

-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-  
[% 'Name' | $T8 %]:[% HTML.escape(CFDD_shiptoname) %]
[% 'Department' | $T8 %]:[% HTML.escape(CFDD_shiptodepartment_1) %]
 [% HTML.escape(CFDD_shiptodepartment_2) %]
[% 'Street' | $T8 %]:[% HTML.escape(CFDD_shiptostreet) %]
[% 'Zipcode' | $T8 %]:[% HTML.escape(CFDD_shiptozipcode) %]
[% 'City' | $T8 %]:[% HTML.escape(CFDD_shiptocity) %]
[% 'Country' | $T8 %]:[% HTML.escape(CFDD_shiptocountry) %]
[% 'Contact' | $T8 %]:[% HTML.escape(CFDD_shiptocontact) %]
[% 'Phone' | $T8 %]:[% HTML.escape(CFDD_shiptophone) %]
[% 'Fax' | $T8 %]:[% HTML.escape(CFDD_shiptofax) %]
[% 'E-mail' | $T8 %]:[% HTML.escape(CFDD_shiptoemail) %]

- 

-
-  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
- 

-
- 

-
-  

-    
-   
-  

-
-  
-  
-
-  [%- FOREACH row = VARIABLES %]
-  
-  [%- END %]
-
- 

-
-
-
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
new file mode 100644
index 000000000..de6d7b9bb
--- /dev/null
+++ b/templates/webpages/oe/form_footer.html
@@ -0,0 +1,171 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  
+    
+      
+        
+          
+[%- IF is_sales %]
+          
+[%- END %]
+          
+        
+      

+            
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+            
+      [%- IF id && num_follow_ups %]
+      
+       
+      
+      [%- END %]
+      
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]
[% notes %][% intnotes %]
[% 'Payment Terms' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
+                           label_key  = 'description',
+                           show_empty = 1 -%]
+                
[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]

+          		
+            
+
+            
+              
+              
+            
+            
+              
+              
+              
+            
+
+            
+            
+            
[% 'Ertrag' | $T8 %][% LxERP.format_amount(marge_total, 2) %]
[% 'Ertrag prozentual' | $T8 %][% LxERP.format_amount(marge_percent, 2) %]%

+          		
+[%- IF taxaccounts %]
+            [% 'Tax Included' | $T8 %]


+[%- END %]
+            
+[%- IF NOT taxincluded %]
+              
+                
+                
+              
+[%- END %]
+              [% tax %]
+              
+                
+                
+              
+            
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

+          

+    
+  
+  
+  
+  
+    

+  
+
+[%- IF webdav %]
+  
+    Dokumente im Webdav-Repository
+  
+  
+   
+    
+     
+      
+      
+     
+ [%- FOREACH file = WEBDAV %]
+      
+        
+        
+      
+ [%- END %]
+    
DateinameWebdavlink
[% HTML.escape(file.name) %][% HTML.escape(file.type) %]

+   
+  
+  
+    

+  
+[%- END %]
+
+  
+    
+      [% print_options %]
+    
+  
+
+
+[% label_edit %]

+
+
+
+
+
+
+
+[%- IF id %]
+  
+  
+
+  
[% label_workflow %]

+  
+  
+
+  [%- IF is_sales_quo %]
+    
+  [%- END %]
+
+  [%- IF is_req_quo %]
+    
+  [%- END %]
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    
+  [%- END %]
+
+  
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    
[% heading %] als neue Vorlage verwenden für

+    [%- IF is_sales_ord %]
+      
+     
+    [%- ELSE %]
+    [%- IF is_pur_ord %]
+      
+     
+    [%- END %]
+    [%- END %]
+  [%- END %]
+[%- END %]
+
+
+
+[% IF vc == 'customer' %]
+  
+[% ELSE %]
+  
+[% END %]
+
+
+
+
+
diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
deleted file mode 100644
index de6d7b9bb..000000000
--- a/templates/webpages/oe/form_footer_master.html
+++ /dev/null
@@ -1,171 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-  
-    
-      
-        
-          
-[%- IF is_sales %]
-          
-[%- END %]
-          
-        
-      

-            
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-            
-      [%- IF id && num_follow_ups %]
-      
-       
-      
-      [%- END %]
-      
[% 'Notes' | $T8 %][% 'Internal Notes' | $T8 %]
[% notes %][% intnotes %]
[% 'Payment Terms' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                
[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]

-          		
-            
-
-            
-              
-              
-            
-            
-              
-              
-              
-            
-
-            
-            
-            
[% 'Ertrag' | $T8 %][% LxERP.format_amount(marge_total, 2) %]
[% 'Ertrag prozentual' | $T8 %][% LxERP.format_amount(marge_percent, 2) %]%

-          		
-[%- IF taxaccounts %]
-            [% 'Tax Included' | $T8 %]


-[%- END %]
-            
-[%- IF NOT taxincluded %]
-              
-                
-                
-              
-[%- END %]
-              [% tax %]
-              
-                
-                
-              
-            
[% 'Subtotal' | $T8 %][% LxERP.format_amount(invsubtotal, 2) %]
[% 'Total' | $T8 %][% LxERP.format_amount(invtotal, 2) %]

-          

-    
-  
-  
-  
-  
-    

-  
-
-[%- IF webdav %]
-  
-    Dokumente im Webdav-Repository
-  
-  
-   
-    
-     
-      
-      
-     
- [%- FOREACH file = WEBDAV %]
-      
-        
-        
-      
- [%- END %]
-    
DateinameWebdavlink
[% HTML.escape(file.name) %][% HTML.escape(file.type) %]

-   
-  
-  
-    

-  
-[%- END %]
-
-  
-    
-      [% print_options %]
-    
-  
-
-
-[% label_edit %]

-
-
-
-
-
-
-
-[%- IF id %]
-  
-  
-
-  
[% label_workflow %]

-  
-  
-
-  [%- IF is_sales_quo %]
-    
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    
-  [%- END %]
-
-  
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    
[% heading %] als neue Vorlage verwenden für

-    [%- IF is_sales_ord %]
-      
-     
-    [%- ELSE %]
-    [%- IF is_pur_ord %]
-      
-     
-    [%- END %]
-    [%- END %]
-  [%- END %]
-[%- END %]
-
-
-
-[% IF vc == 'customer' %]
-  
-[% ELSE %]
-  
-[% END %]
-
-
-
-
-
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
new file mode 100644
index 000000000..ba6c9cca9
--- /dev/null
+++ b/templates/webpages/oe/form_header.html
@@ -0,0 +1,274 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+  

+
+    
+    
+    
+    
+    
+    
+
+[%- FOREACH row = HIDDENS %]
+   
+[%- END %]
+
+    
+
+    
+    
+    
+    
+
+    
[% title %]

+
+    
+      
+      
+        
+      
+
+    
diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
deleted file mode 100644
index ba6c9cca9..000000000
--- a/templates/webpages/oe/form_header_master.html
+++ /dev/null
@@ -1,274 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
-  
-
-    
-    
-    
-    
-    
-    
-
-[%- FOREACH row = HIDDENS %]
-   
-[%- END %]
-
-    
-
-    
-    
-    
-    
-
-    
[% title %]

-
-    

+          
+            
+              
+              
+            
+          

+                
+                  
+                    
+                    
+                  
+[%- IF ALL_CONTACTS.size %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF is_order %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF business %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF max_dunning_level %]
+                  
+                    
+                    
+                  
+[%- END %]
+                  
+                    
+                    
+                  
+[%- IF ALL_DEPARTMENTS %]
+                  
+                    
+                    
+                  
+[%- END %]
+                  
+[%- IF currencies %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF show_exchangerate %]
+                  
+                    
+                    
+                  
+[%- END %]
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+[%- IF show_delivery_customer %]
+                  
+                    
+                  
+[%- END %]
+                
[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name          = vc,
+                           style         = 'width: 250px',
+                           DATA          = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
+                           id_sub        = 'vc_keys',
+                           label_key     = 'name',
+                           select        = vc_select,
+                           limit         = vclimit,
+                           allow_textbox = 1,
+                           onChange      = "document.getElementById('update_button').click();" -%]
+                      
+                    
[% 'Contact Person' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
+                           label_sub  = 'contact_labels',
+                           show_empty = 1 -%]
+                    
[% 'Shipping Address' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'shipto_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_SHIPTO,
+                           id_key     = 'shipto_id',
+                           label_sub  = 'shipto_labels',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    
[% 'Credit Limit' | $T8 %][% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] [% LxERP.format_amount(creditremaining, 0) %]
[% business_label %][% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %
[% 'Max. Dunning Level' | $T8 %]:
+                      [% HTML.escape(max_dunning_level) %];
+                      [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount, 2) %]
+                    
[% 'Steuersatz' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
+                           label_key  = 'description' -%]
+                    
[% 'Department' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'department_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_DEPARTMENTS,
+                           id_key     = 'id',
+                           label_sub  = 'department_labels',
+                           show_empty = 1 -%]
+                    
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
+                     [%- IF forex %]
+                      [% LxERP.format_amount(exchangerate, 2) %]
+                     [%- ELSE %]
+                      
+                     [%- END %]
+                    
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

+                      
+                        
+                          
+                          
+                        
+                        
+                          
+                          
+                        
+                      

+                          
+                        
+                          

+                            
+                          
+                          

+                    

+              		
+                
+              [% openclosed %]
+                  
+                    
+                    
+                  
+[%- IF is_sales and ALL_SALESMEN.size %]
+                  
+                    
+                    
+                  
+[%- END %]
+[%- IF is_order %]
+                  
+                    
+                    
+                  
+[%- END %]
+                  
+                    
+                    
+                  
+[%- IF is_order %]
+                  
+                    
+                    
+                  
+[%- END %]
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                  
+                    
+                    
+                  
+                
[% 'Employee' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    
[% 'Salesman' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'salesman_id',
+                           default    = salesman_id ? salesman_id : employee_id,
+                           DATA       = ALL_SALESMEN,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    
[% 'Order Number' | $T8 %]
[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]
[% 'Customer Order Number' | $T8 %]

+                     [%- IF is_order %]
+                      [% 'Order Date' | $T8 %]
+                     [%- ELSE %]
+                      [% 'Quotation Date' | $T8 %]
+                     [%- END %]
+                    
+                      
+                      
+                    

+                     [%- IF is_sales_quo %]
+                      [% 'Valid until' | $T8 %]
+                     [%- ELSE %]
+                      [% 'Required by' | $T8 %]
+                     [%- END %]
+                    
+                      
+                      
+                    
[% 'Project Number' | $T8 %]
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'globalproject_id',
+                           DATA       = ALL_PROJECTS,
+                           id_key     = 'id',
+                           label_key  = 'projectnumber',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    

+              

+        

-      
-      
-        
-      
-
-    
diff --git a/templates/webpages/oe/orders_bottom.html b/templates/webpages/oe/orders_bottom.html
new file mode 100644
index 000000000..5ceb69c47
--- /dev/null
+++ b/templates/webpages/oe/orders_bottom.html
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
+ [%- IF SHOW_CONTINUE_BUTTON %]
+ [% 'New sales order' | $T8 %]

+ 
+ [%- END %]
+ 
+ 
+ 
+ 
+ 
+
diff --git a/templates/webpages/oe/orders_bottom_master.html b/templates/webpages/oe/orders_bottom_master.html
deleted file mode 100644
index 5ceb69c47..000000000
--- a/templates/webpages/oe/orders_bottom_master.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
- [%- IF SHOW_CONTINUE_BUTTON %]
- [% 'New sales order' | $T8 %]

- 
- [%- END %]
- 
- 
- 
- 
- 
-
diff --git a/templates/webpages/oe/orders_top.html b/templates/webpages/oe/orders_top.html
new file mode 100644
index 000000000..f6bc1de7b
--- /dev/null
+++ b/templates/webpages/oe/orders_top.html
@@ -0,0 +1 @@
+
diff --git a/templates/webpages/oe/orders_top_master.html b/templates/webpages/oe/orders_top_master.html
deleted file mode 100644
index f6bc1de7b..000000000
--- a/templates/webpages/oe/orders_top_master.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/templates/webpages/oe/report_for_todo_list.html b/templates/webpages/oe/report_for_todo_list.html
new file mode 100644
index 000000000..6b8a18464
--- /dev/null
+++ b/templates/webpages/oe/report_for_todo_list.html
@@ -0,0 +1,45 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+
[% 'Overdue sales quotations and requests for quotations' | $T8 %]

+
+

+ 

-          
-            
-              
-              
-            
-          

-                
-                  
-                    
-                    
-                  
-[%- IF ALL_CONTACTS.size %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF is_order %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF business %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF max_dunning_level %]
-                  
-                    
-                    
-                  
-[%- END %]
-                  
-                    
-                    
-                  
-[%- IF ALL_DEPARTMENTS %]
-                  
-                    
-                    
-                  
-[%- END %]
-                  
-[%- IF currencies %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF show_exchangerate %]
-                  
-                    
-                    
-                  
-[%- END %]
-                  
-                    
-                    
-                  
-                  
-                    
-                    
-                  
-                  
-                    
-                    
-                  
-[%- IF show_delivery_customer %]
-                  
-                    
-                  
-[%- END %]
-                
[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name          = vc,
-                           style         = 'width: 250px',
-                           DATA          = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
-                           id_sub        = 'vc_keys',
-                           label_key     = 'name',
-                           select        = vc_select,
-                           limit         = vclimit,
-                           allow_textbox = 1,
-                           onChange      = "document.getElementById('update_button').click();" -%]
-                      
-                    
[% 'Contact Person' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    
[% 'Shipping Address' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'shipto_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_SHIPTO,
-                           id_key     = 'shipto_id',
-                           label_sub  = 'shipto_labels',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    
[% 'Credit Limit' | $T8 %][% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] [% LxERP.format_amount(creditremaining, 0) %]
[% business_label %][% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %
[% 'Max. Dunning Level' | $T8 %]:
-                      [% HTML.escape(max_dunning_level) %];
-                      [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount, 2) %]
-                    
[% 'Steuersatz' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    
[% 'Department' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'department_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_DEPARTMENTS,
-                           id_key     = 'id',
-                           label_sub  = 'department_labels',
-                           show_empty = 1 -%]
-                    
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %]
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 2) %]
-                     [%- ELSE %]
-                      
-                     [%- END %]
-                    
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]

-                      
-                        
-                          
-                          
-                        
-                        
-                          
-                          
-                        
-                      

-                          
-                        
-                          

-                            
-                          
-                          

-                    

-              		
-                
-              [% openclosed %]
-                  
-                    
-                    
-                  
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  
-                    
-                    
-                  
-[%- END %]
-[%- IF is_order %]
-                  
-                    
-                    
-                  
-[%- END %]
-                  
-                    
-                    
-                  
-[%- IF is_order %]
-                  
-                    
-                    
-                  
-[%- END %]
-                  
-                    
-                    
-                  
-                  
-                    
-                    
-                  
-                  
-                    
-                    
-                  
-                
[% 'Employee' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    
[% 'Salesman' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'salesman_id',
-                           default    = salesman_id ? salesman_id : employee_id,
-                           DATA       = ALL_SALESMEN,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    
[% 'Order Number' | $T8 %]
[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]
[% 'Customer Order Number' | $T8 %]

-                     [%- IF is_order %]
-                      [% 'Order Date' | $T8 %]
-                     [%- ELSE %]
-                      [% 'Quotation Date' | $T8 %]
-                     [%- END %]
-                    
-                      
-                      
-                    

-                     [%- IF is_sales_quo %]
-                      [% 'Valid until' | $T8 %]
-                     [%- ELSE %]
-                      [% 'Required by' | $T8 %]
-                     [%- END %]
-                    
-                      
-                      
-                    
[% 'Project Number' | $T8 %]
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'globalproject_id',
-                           DATA       = ALL_PROJECTS,
-                           id_key     = 'id',
-                           label_key  = 'projectnumber',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    

-              

-        

+  
+   
+   
+   
+   
+   
+   
+   
+  
+
+  [%- FOREACH row = QUOTATIONS %]
+  
+   
+   
+   
+   
+   
+   
+   
+  
+  [%- END %]
+ 
[% 'Date' | $T8 %][% 'Valid until' | $T8 %][% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %][% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %][% 'Transaction description' | $T8 %][% 'Amount' | $T8 %][% 'Employee' | $T8 %]
[% HTML.escape(row.transdate) %][% HTML.escape(row.reqdate) %]
+    
+     [% IF row.vc == 'customer' %]
+     [% 'Sales quotation' | $T8 %]
+     [% ELSE %]
+     [% 'Request quotation' | $T8 %]
+     [% END %]
+     [% HTML.escape(row.quonumber) %]
+    
+   
+    [% IF row.vc == 'customer' %]
+    [% HTML.escape(row.customer) %]
+    [% ELSE %]
+    [% HTML.escape(row.vendor) %]
+    [% END %]
+   [% HTML.escape(row.transaction_description) %][% HTML.escape(LxERP.format_amount(row.amount, 2)) %][% HTML.escape(row.employee) %]

+

diff --git a/templates/webpages/oe/report_for_todo_list_master.html b/templates/webpages/oe/report_for_todo_list_master.html
deleted file mode 100644
index 6b8a18464..000000000
--- a/templates/webpages/oe/report_for_todo_list_master.html
+++ /dev/null
@@ -1,45 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-
[% 'Overdue sales quotations and requests for quotations' | $T8 %]

-
-

- 
-  
-   
-   
-   
-   
-   
-   
-   
-  
-
-  [%- FOREACH row = QUOTATIONS %]
-  
-   
-   
-   
-   
-   
-   
-   
-  
-  [%- END %]
- 
[% 'Date' | $T8 %][% 'Valid until' | $T8 %][% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %][% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %][% 'Transaction description' | $T8 %][% 'Amount' | $T8 %][% 'Employee' | $T8 %]
[% HTML.escape(row.transdate) %][% HTML.escape(row.reqdate) %]
-    
-     [% IF row.vc == 'customer' %]
-     [% 'Sales quotation' | $T8 %]
-     [% ELSE %]
-     [% 'Request quotation' | $T8 %]
-     [% END %]
-     [% HTML.escape(row.quonumber) %]
-    
-   
-    [% IF row.vc == 'customer' %]
-    [% HTML.escape(row.customer) %]
-    [% ELSE %]
-    [% HTML.escape(row.vendor) %]
-    [% END %]
-   [% HTML.escape(row.transaction_description) %][% HTML.escape(LxERP.format_amount(row.amount, 2)) %][% HTML.escape(row.employee) %]

-

diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
new file mode 100644
index 000000000..dcde83af6
--- /dev/null
+++ b/templates/webpages/oe/sales_order.html
@@ -0,0 +1,33 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+  
+  
+  
+   [% FOREACH header = HEADER %][% IF header.display %]
+    [% END %][% END %]
+   
+
+   [% FOREACH row = ROWS %]
+     [% FOREACH row1 = row.ROW1 %]
+      [% END %]
+     
+
+     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
+     [% END %]
+
+     
+   [% END %]
+
+  
[% header.value %]
[% row1.value %]
[% FOREACH row2 = row.ROW2 %]
+      [% IF row2.line_break %]
[% END %]
+      [% row2.value %][% END %]
+     

+ 
+
+
diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
deleted file mode 100644
index dcde83af6..000000000
--- a/templates/webpages/oe/sales_order_master.html
+++ /dev/null
@@ -1,33 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-  
-  
-  
-   [% FOREACH header = HEADER %][% IF header.display %]
-    [% END %][% END %]
-   
-
-   [% FOREACH row = ROWS %]
-     [% FOREACH row1 = row.ROW1 %]
-      [% END %]
-     
-
-     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
-     [% END %]
-
-     
-   [% END %]
-
-  
[% header.value %]
[% row1.value %]
[% FOREACH row2 = row.ROW2 %]
-      [% IF row2.line_break %]
[% END %]
-      [% row2.value %][% END %]
-     

- 
-
-
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
new file mode 100644
index 000000000..90cb60252
--- /dev/null
+++ b/templates/webpages/oe/search.html
@@ -0,0 +1,277 @@
+[%- USE HTML %]
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
+[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
+
+
+
+
+ 
[% HTML.escape(title) %]

+
+
+ 
+  
+ 
+

+   
+    
+     
+     
+    
+[%- IF ALL_DEPARTMENTS.size %]
+    
+     
+     
+    
+[%- END %]
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+    
+    
+     
+     
+     
+     
+    
+    
+     
+     
+     
+     
+    
+    
+     
+     
+    
+   
[% HTML.escape(vclabel) %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = vc,
+                 default       = vc == 'customer' ? oldcustomer : oldvendor,
+                 style         = 'width: 250px',
+                 DATA          = ALL_VC,
+                 id_sub        = 'vc_keys',
+                 label_key     = 'name',
+                 select        = vc_select,
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 1,
+                 -%]
+     
[% 'Department' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'department_id',
+                 style         = 'width: 250px',
+                 DATA          = ALL_DEPARTMENTS,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 1,
+            -%]
+     
[% HTML.escape(ordlabel) %]
[% 'Employee' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'employee_id',
+                 style         = 'width: 250px',
+                 DATA          =  ALL_EMPLOYEES,
+                 id_key        = 'id',
+                 label_sub     = 'employee_labels',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 0,
+                 default       = ' ',
+            -%]
+     
[% 'Salesman' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'salesman_id',
+                 style         = 'width: 250px',
+                 DATA          =  ALL_SALESMEN,
+                 id_key        = 'id',
+                 label_sub     = 'salesman_labels',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+     
[% 'Transaction description' | $T8 %]
[% 'Project Number' | $T8 %]
+            [%- INCLUDE 'generic/multibox.html'
+                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
+                 style         = "width: 250px",
+                 DATA          =  ALL_PROJECTS,
+                 id_key        = 'id',
+                 label_key     = 'projectnumber',
+                 limit         = vclimit,
+                 show_empty    = 1,
+                 allow_textbox = 1,
+            -%]
+     
[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]
+      
+      
+     [% 'Bis' | $T8 %]
+      
+      
+     
[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]
+      
+      
+     [% 'Bis' | $T8 %]
+      
+      
+     
[% 'Include in Report' | $T8 %]
+      
+       
+        
+        
+       
+[%- IF type == 'sales_order' OR type == 'purchase_order' %]
+       
+        
+        
+       
+[%- END %]
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+        
+       
+       
+        
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+       
+       
+        
+        
+        
+       
+[%- IF type == 'sales_order' %]
+       
+[%- END %]
+      

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        
[% HTML.escape(vclabel) %]

+         
+         
+        
+         
+         
+        
+         
+         
+        

+     

+  

+
+
+
+

+
+
+
+
+
+
+
+
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
deleted file mode 100644
index 90cb60252..000000000
--- a/templates/webpages/oe/search_master.html
+++ /dev/null
@@ -1,277 +0,0 @@
-[%- USE HTML %]
-[%- USE T8 %]
-[%- USE LxERP %]
-[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
-[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
-
-
-

-
- 
[% HTML.escape(title) %]

-
-
- 
-  
- 
-

-   
-    
-     
-     
-    
-[%- IF ALL_DEPARTMENTS.size %]
-    
-     
-     
-    
-[%- END %]
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-    
-    
-     
-     
-     
-     
-    
-    
-     
-     
-     
-     
-    
-    
-     
-     
-    
-   
[% HTML.escape(vclabel) %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = vc,
-                 default       = vc == 'customer' ? oldcustomer : oldvendor,
-                 style         = 'width: 250px',
-                 DATA          = ALL_VC,
-                 id_sub        = 'vc_keys',
-                 label_key     = 'name',
-                 select        = vc_select,
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 1,
-                 -%]
-     
[% 'Department' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department_id',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 1,
-            -%]
-     
[% HTML.escape(ordlabel) %]
[% 'Employee' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'employee_id',
-                 style         = 'width: 250px',
-                 DATA          =  ALL_EMPLOYEES,
-                 id_key        = 'id',
-                 label_sub     = 'employee_labels',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 0,
-                 default       = ' ',
-            -%]
-     
[% 'Salesman' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'salesman_id',
-                 style         = 'width: 250px',
-                 DATA          =  ALL_SALESMEN,
-                 id_key        = 'id',
-                 label_sub     = 'salesman_labels',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-     
[% 'Transaction description' | $T8 %]
[% 'Project Number' | $T8 %]
-            [%- INCLUDE 'generic/multibox.html'
-                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
-                 style         = "width: 250px",
-                 DATA          =  ALL_PROJECTS,
-                 id_key        = 'id',
-                 label_key     = 'projectnumber',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 1,
-            -%]
-     
[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]
-      
-      
-     [% 'Bis' | $T8 %]
-      
-      
-     
[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]
-      
-      
-     [% 'Bis' | $T8 %]
-      
-      
-     
[% 'Include in Report' | $T8 %]
-      
-       
-        
-        
-       
-[%- IF type == 'sales_order' OR type == 'purchase_order' %]
-       
-        
-        
-       
-[%- END %]
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-        
-       
-       
-        
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-       
-       
-        
-        
-        
-       
-[%- IF type == 'sales_order' %]
-       
-[%- END %]
-      

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        
[% HTML.escape(vclabel) %]

-         
-         
-        
-         
-         
-        
-         
-         
-        

-     

-  

-
-
-
-

-
-
-
-
-

-
-
-
diff --git a/templates/webpages/projects/project_form.html b/templates/webpages/projects/project_form.html
new file mode 100644
index 000000000..c27a2547b
--- /dev/null
+++ b/templates/webpages/projects/project_form.html
@@ -0,0 +1,102 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ [%- IF message %]
+ 
[% message %]

+
+ 

+ [%- END %]
+
+ 
[% title %]

+
+ 

+
+  
+  
+
+  
+
+  

+
+   

+
+    
+     
+      
+      
+     
+
+     
+      
+      
+     
+
+     [%- IF project.id %]
+     
+      
+      
+     
+     [%- END %]
+    
[% 'Number' | $T8 %]
[% 'Description' | $T8 %]
+       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
+       [%- IF rows > 1 %]
+       
+       [%- ELSE %]
+       
+       [%- END %]
+      
 
+       
+       
+      

+
+    

+   

+
+   [%- IF CUSTOM_VARIABLES.size %]
+   

+
+    

+     
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      
+       
+       
+      
+      [%- END %]
+     
[% HTML.escape(var.description) %][% var.HTML_CODE %]

+    

+
+    

+   

+   [%- END %]
+
+  

+
+  

+   
+   [%- IF project.id %]
+   
+   [%- IF project.orphaned %]
+   
+   [%- END %]
+   
+   [%- END %]
+  

+ 

+
+ 
+
+
+
diff --git a/templates/webpages/projects/project_form_master.html b/templates/webpages/projects/project_form_master.html
deleted file mode 100644
index c27a2547b..000000000
--- a/templates/webpages/projects/project_form_master.html
+++ /dev/null
@@ -1,102 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- [%- IF message %]
- 
[% message %]

-
- 

- [%- END %]
-
- 
[% title %]

-
- 

-
-  
-  
-
-  
-
-  

-
-   

-
-    
-     
-      
-      
-     
-
-     
-      
-      
-     
-
-     [%- IF project.id %]
-     
-      
-      
-     
-     [%- END %]
-    
[% 'Number' | $T8 %]
[% 'Description' | $T8 %]
-       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
-       [%- IF rows > 1 %]
-       
-       [%- ELSE %]
-       
-       [%- END %]
-      
 
-       
-       
-      

-
-    

-   

-
-   [%- IF CUSTOM_VARIABLES.size %]
-   

-
-    

-     
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      
-       
-       
-      
-      [%- END %]
-     
[% HTML.escape(var.description) %][% var.HTML_CODE %]

-    

-
-    

-   

-   [%- END %]
-
-  

-
-  

-   
-   [%- IF project.id %]
-   
-   [%- IF project.orphaned %]
-   
-   [%- END %]
-   
-   [%- END %]
-  

- 

-
- 
-
-
-
diff --git a/templates/webpages/projects/search.html b/templates/webpages/projects/search.html
new file mode 100644
index 000000000..e7b030c44
--- /dev/null
+++ b/templates/webpages/projects/search.html
@@ -0,0 +1,70 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 

+
+  
[% title %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+    
+     
+     
+    
+   
[% 'Number' | $T8 %]
[% 'Description' | $T8 %]
[% 'Include in Report' | $T8 %]
+      
+       
+        
+        
+        
+       
+
+       
+        
+        
+       
+
+       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+
+      

+         
+         
+        
+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+     

+  

+
+  

+
+  
+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/projects/search_master.html b/templates/webpages/projects/search_master.html
deleted file mode 100644
index e7b030c44..000000000
--- a/templates/webpages/projects/search_master.html
+++ /dev/null
@@ -1,70 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 

-
-  
[% title %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-    
-     
-     
-    
-   
[% 'Number' | $T8 %]
[% 'Description' | $T8 %]
[% 'Include in Report' | $T8 %]
-      
-       
-        
-        
-        
-       
-
-       
-        
-        
-       
-
-       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-      

-         
-         
-        
-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-     

-  

-
-  

-
-  
-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/report_generator/csv_export_options.html b/templates/webpages/report_generator/csv_export_options.html
new file mode 100644
index 000000000..ee7f442f7
--- /dev/null
+++ b/templates/webpages/report_generator/csv_export_options.html
@@ -0,0 +1,87 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
[% HTML.escape(title) %]

+
+ 

+
+  [%- FOREACH var = HIDDEN %]
+  
+  [%- END %]
+
+  
+  
+  
+
+  
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+  
[% 'Quote chararacter' | $T8 %]
+     
+    
[% 'Escape character' | $T8 %]
+     
+    
[% 'Separator chararacter' | $T8 %]
+     
+    
[% 'Line endings' | $T8 %]
+     
+    
[% 'Options' | $T8 %]:
+     
+     
+    

+
+  

+   
+   
+  

+
+ 

+
+
diff --git a/templates/webpages/report_generator/csv_export_options_master.html b/templates/webpages/report_generator/csv_export_options_master.html
deleted file mode 100644
index ee7f442f7..000000000
--- a/templates/webpages/report_generator/csv_export_options_master.html
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
[% HTML.escape(title) %]

-
- 

-
-  [%- FOREACH var = HIDDEN %]
-  
-  [%- END %]
-
-  
-  
-  
-
-  
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-  
[% 'Quote chararacter' | $T8 %]
-     
-    
[% 'Escape character' | $T8 %]
-     
-    
[% 'Separator chararacter' | $T8 %]
-     
-    
[% 'Line endings' | $T8 %]
-     
-    
[% 'Options' | $T8 %]:
-     
-     
-    

-
-  

-   
-   
-  

-
- 

-
-
diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
new file mode 100644
index 000000000..fa8874c5b
--- /dev/null
+++ b/templates/webpages/report_generator/html_report.html
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+
+ [% IF MESSAGE %]
+  
[% MESSAGE %]

+ [% END %]
+
+ 
[% TITLE %]

+
+ [% IF TOP_INFO_TEXT %]
+  
[% TOP_INFO_TEXT %]

+ [% END %]
+
+ [% RAW_TOP_INFO_TEXT %]
+
+ [% IF DATA_PRESENT %]
+ 

+  
+   [%- FOREACH row = HEADER_ROWS %]
+   
+    [% FOREACH col = row %]
+     
+    [% END %]
+   
+   [%- END %]
+
+   [% FOREACH row = ROWS %]
+    [% IF row.IS_CONTROL %]
+     [% IF row.IS_COLSPAN_DATA %][% END %]
+     [% ELSE %]
+     
+      [%- FOREACH col = row.COLUMNS %]
+       1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
+         [%- SET tdclass = '' %]
+         [%- IF row.BORDER_TOP %][%- SET tdclass = "$tdclass top_border" %][%- END %]
+         [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
+         [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
+         [%- IF tdclass %] class="[% tdclass %]"[%- END %]>
+       [%- IF col.raw_data %]
+        [%- col.raw_data %]
+       [%- ELSE %]
+        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+         [%- IF cell_row.data != '' %]
+          [%- IF cell_row.link %][%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %][%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]
[%- END %]
+        [%- END %]
+       [%- END %]
+      
+      [%- END %]
+     
+    [% END %]
+   [% END %]
+
+   
+
+  
 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
+     >
+      [%- IF col.link -%][%- END -%]
+      [%- col.text -%]
+      [%- IF col.show_sort_indicator -%][%- END -%]
+      [%- IF col.link -%][%- END -%]
+     
[% row.data %]

+ 

+ [% ELSE %]
+  
[% 'No data was found.' | $T8 %]

+ [% END %]
+
+ [% RAW_BOTTOM_INFO_TEXT %]
+
+ [% IF BOTTOM_INFO_TEXT %]
+  
[% BOTTOM_INFO_TEXT %]

+ [% END %]
+
+ [% IF SHOW_EXPORT_BUTTONS %]
+  

+   [% FOREACH var = EXPORT_VARIABLES %]
+   [% END %]
+
+   
+   
+   
+   
+
+   

+    [% 'List export' | $T8 %]

+    [% IF ALLOW_PDF_EXPORT %][% END %]
+    [% IF ALLOW_CSV_EXPORT %][% END %]
+   

+  

+ [% END %]
+
+
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
deleted file mode 100644
index fa8874c5b..000000000
--- a/templates/webpages/report_generator/html_report_master.html
+++ /dev/null
@@ -1,122 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-
- [% IF MESSAGE %]
-  
[% MESSAGE %]

- [% END %]
-
- 
[% TITLE %]

-
- [% IF TOP_INFO_TEXT %]
-  
[% TOP_INFO_TEXT %]

- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- 

-  
-   [%- FOREACH row = HEADER_ROWS %]
-   
-    [% FOREACH col = row %]
-     
-    [% END %]
-   
-   [%- END %]
-
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %][% END %]
-     [% ELSE %]
-     
-      [%- FOREACH col = row.COLUMNS %]
-       1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
-         [%- SET tdclass = '' %]
-         [%- IF row.BORDER_TOP %][%- SET tdclass = "$tdclass top_border" %][%- END %]
-         [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
-         [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
-         [%- IF tdclass %] class="[% tdclass %]"[%- END %]>
-       [%- IF col.raw_data %]
-        [%- col.raw_data %]
-       [%- ELSE %]
-        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-         [%- IF cell_row.data != '' %]
-          [%- IF cell_row.link %][%- END %]
-          [%- cell_row.data %]
-          [%- IF cell_row.link %][%- END %]
-         [%- END %]
-        [%- UNLESS iterator.last %]
[%- END %]
-        [%- END %]
-       [%- END %]
-      
-      [%- END %]
-     
-    [% END %]
-   [% END %]
-
-   
-
-  
 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
-     >
-      [%- IF col.link -%][%- END -%]
-      [%- col.text -%]
-      [%- IF col.show_sort_indicator -%][%- END -%]
-      [%- IF col.link -%][%- END -%]
-     
[% row.data %]

- 

- [% ELSE %]
-  
[% 'No data was found.' | $T8 %]

- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  
[% BOTTOM_INFO_TEXT %]

- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  

-   [% FOREACH var = EXPORT_VARIABLES %]
-   [% END %]
-
-   
-   
-   
-   
-
-   

-    [% 'List export' | $T8 %]

-    [% IF ALLOW_PDF_EXPORT %][% END %]
-    [% IF ALLOW_CSV_EXPORT %][% END %]
-   

-  

- [% END %]
-
-
diff --git a/templates/webpages/report_generator/pdf_export_options.html b/templates/webpages/report_generator/pdf_export_options.html
new file mode 100644
index 000000000..41eb6c019
--- /dev/null
+++ b/templates/webpages/report_generator/pdf_export_options.html
@@ -0,0 +1,144 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+ [%- SET default_margin = LxERP.format_amount(1.5) %]
+
+ 
+
+ 
[% HTML.escape(title) %]

+
+ 

+
+  [%- FOREACH var = HIDDEN %]
+  
+  [%- END %]
+
+  
+  
+  
+
+  
+   
+    
+    
+   
+
+   [%- IF ALLOW_FONT_SELECTION %]
+   
+    
+    
+   
+   [%- END %]
+
+   
+    
+    
+   
+
+   
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   
+    
+    
+   
+
+   [% IF ALL_PRINTERS.size %]
+    
+     
+     
+    
+
+    
+     
+     
+    
+   [% END %]
+  
[% 'Orientation' | $T8 %]
+     
+     
+    
[% 'Font' | $T8 %]
+     
+    
[% 'Font size' | $T8 %]
+     
+      
+     pt
+    
[% 'Margins' | $T8 %]:
[% 'Top' | $T8 %] cm
[% 'Left' | $T8 %] cm
[% 'Bottom' | $T8 %] cm
[% 'Right' | $T8 %] cm
[% 'Options' | $T8 %]:
+     
+     
+     [% IF ALL_PRINTERS.size %]
+      

+      
+      
+     [% END %]
+    
[% 'Printer' | $T8 %]
+      
+     
[% 'Copies' | $T8 %]

+
+  

+   
+   
+  

+
+ 

+
+
diff --git a/templates/webpages/report_generator/pdf_export_options_master.html b/templates/webpages/report_generator/pdf_export_options_master.html
deleted file mode 100644
index 41eb6c019..000000000
--- a/templates/webpages/report_generator/pdf_export_options_master.html
+++ /dev/null
@@ -1,144 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
- [%- SET default_margin = LxERP.format_amount(1.5) %]
-
- 
-
- 
[% HTML.escape(title) %]

-
- 

-
-  [%- FOREACH var = HIDDEN %]
-  
-  [%- END %]
-
-  
-  
-  
-
-  
-   
-    
-    
-   
-
-   [%- IF ALLOW_FONT_SELECTION %]
-   
-    
-    
-   
-   [%- END %]
-
-   
-    
-    
-   
-
-   
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   
-    
-    
-   
-
-   [% IF ALL_PRINTERS.size %]
-    
-     
-     
-    
-
-    
-     
-     
-    
-   [% END %]
-  
[% 'Orientation' | $T8 %]
-     
-     
-    
[% 'Font' | $T8 %]
-     
-    
[% 'Font size' | $T8 %]
-     
-      
-     pt
-    
[% 'Margins' | $T8 %]:
[% 'Top' | $T8 %] cm
[% 'Left' | $T8 %] cm
[% 'Bottom' | $T8 %] cm
[% 'Right' | $T8 %] cm
[% 'Options' | $T8 %]:
-     
-     
-     [% IF ALL_PRINTERS.size %]
-      

-      
-      
-     [% END %]
-    
[% 'Printer' | $T8 %]
-      
-     
[% 'Copies' | $T8 %]

-
-  

-   
-   
-  

-
- 

-
-
diff --git a/templates/webpages/rp/aging_ar_bottom.html b/templates/webpages/rp/aging_ar_bottom.html
new file mode 100644
index 000000000..d148e2225
--- /dev/null
+++ b/templates/webpages/rp/aging_ar_bottom.html
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[% USE HTML %] 
+
+ [% PRINT_OPTIONS %]
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ [% 'Statement' | $T8 %]
+ 

+ 
+ 
+ 
+
+
diff --git a/templates/webpages/rp/aging_ar_bottom_master.html b/templates/webpages/rp/aging_ar_bottom_master.html
deleted file mode 100644
index d148e2225..000000000
--- a/templates/webpages/rp/aging_ar_bottom_master.html
+++ /dev/null
@@ -1,20 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %] 
-
- [% PRINT_OPTIONS %]
-
- 
- 
- 
- 
- 
- 
- 
-
- [% 'Statement' | $T8 %]
- 

- 
- 
- 
-
-
diff --git a/templates/webpages/rp/aging_ar_top.html b/templates/webpages/rp/aging_ar_top.html
new file mode 100644
index 000000000..066ac9838
--- /dev/null
+++ b/templates/webpages/rp/aging_ar_top.html
@@ -0,0 +1 @@
+

diff --git a/templates/webpages/rp/aging_ar_top_master.html b/templates/webpages/rp/aging_ar_top_master.html
deleted file mode 100644
index 066ac9838..000000000
--- a/templates/webpages/rp/aging_ar_top_master.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/templates/webpages/rp/balance_sheet.html b/templates/webpages/rp/balance_sheet.html
new file mode 100644
index 000000000..1fd8d45b3
--- /dev/null
+++ b/templates/webpages/rp/balance_sheet.html
@@ -0,0 +1,118 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+
+

+[% company %]
+
[% address %]
+
[% 'BALANCE SHEET' | $T8 %]
+
[% period %]
+

+
+
+  
+    
+    
+    
+  
+
+  [% FOREACH row = A %]
+  
+    
+    
+    
+    [%- IF last_period %]
+    
+    [%- END %]
+  
+  [% END %]
+
+[% IF l_subtotal %]
+  
+    
+    
+    
+  
+
+  
+    
+    
+    [%- IF last_period %]
+    
+    [%- END %]
+  
+[% END %]
+
+  
+    
+  
+
+  [% FOREACH row = L %]
+  
+    
+    
+    
+    [%- IF last_period %]
+    
+    [%- END %]
+  
+  [% END %]
+
+[% IF l_subtotal %]
+  
+    
+    
+    
+  
+
+  
+    
+    
+    
+[% END %]
+
+  
+    
+  
+
+  [% FOREACH row = Q %]
+  
+    
+    
+    
+    [%- IF last_period %]
+    
+    [%- END %]
+  
+  [% END  %]
+
+[% IF l_subtotal %]
+  
+    
+    
+    
+  
+
+  
+    
+    
+    
+[% END %]
+
+  
+    
+    
+    [%- IF last_period %]
+    
+    [%- END %]
+  
+
[% 'ASSETS' | $T8 %]
[% this_period %][% last_period %]
 [% row.accno _ ' - ' IF l_accno %][% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.A.this, decimalplaces) %]
[% LxERP.format_amount(total.A.last, decimalplaces) %]
[% 'LIABILITIES' | $T8 %]
[% row.accno _ ' - ' IF l_accno %][% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.L.this, decimalplaces) %]

+    [%- IF last_period %]
+    		[% LxERP.format_amount(total.L.last, decimalplaces) %]

+    [%- END %]
+  
[% 'EQUITY' | $T8 %]
[% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.Q.this, decimalplaces) %]

+    [%- IF last_period %]
+    		[% LxERP.format_amount(total.Q.last, decimalplaces) %]

+    [%- END %]
+  
[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] & [% 'EQUITY' | $T8 %][% LxERP.format_amount(total.this, decimalplaces) %]
[% LxERP.format_amount(total.last, decimalplaces) %]

diff --git a/templates/webpages/rp/balance_sheet_master.html b/templates/webpages/rp/balance_sheet_master.html
deleted file mode 100644
index 1fd8d45b3..000000000
--- a/templates/webpages/rp/balance_sheet_master.html
+++ /dev/null
@@ -1,118 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-
-
-

-[% company %]
-
[% address %]
-
[% 'BALANCE SHEET' | $T8 %]
-
[% period %]
-

-
-
-  
-    
-    
-    
-  
-
-  [% FOREACH row = A %]
-  
-    
-    
-    
-    [%- IF last_period %]
-    
-    [%- END %]
-  
-  [% END %]
-
-[% IF l_subtotal %]
-  
-    
-    
-    
-  
-
-  
-    
-    
-    [%- IF last_period %]
-    
-    [%- END %]
-  
-[% END %]
-
-  
-    
-  
-
-  [% FOREACH row = L %]
-  
-    
-    
-    
-    [%- IF last_period %]
-    
-    [%- END %]
-  
-  [% END %]
-
-[% IF l_subtotal %]
-  
-    
-    
-    
-  
-
-  
-    
-    
-    
-[% END %]
-
-  
-    
-  
-
-  [% FOREACH row = Q %]
-  
-    
-    
-    
-    [%- IF last_period %]
-    
-    [%- END %]
-  
-  [% END  %]
-
-[% IF l_subtotal %]
-  
-    
-    
-    
-  
-
-  
-    
-    
-    
-[% END %]
-
-  
-    
-    
-    [%- IF last_period %]
-    
-    [%- END %]
-  
-
[% 'ASSETS' | $T8 %]
[% this_period %][% last_period %]
 [% row.accno _ ' - ' IF l_accno %][% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.A.this, decimalplaces) %]
[% LxERP.format_amount(total.A.last, decimalplaces) %]
[% 'LIABILITIES' | $T8 %]
[% row.accno _ ' - ' IF l_accno %][% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.L.this, decimalplaces) %]

-    [%- IF last_period %]
-    		[% LxERP.format_amount(total.L.last, decimalplaces) %]

-    [%- END %]
-  
[% 'EQUITY' | $T8 %]
[% row.description %][% LxERP.format_amount(row.this, decimalplaces) %][% LxERP.format_amount(row.last, decimalplaces) %]
 
[% 'TOTAL' | $T8 %][% LxERP.format_amount(total.Q.this, decimalplaces) %]

-    [%- IF last_period %]
-    		[% LxERP.format_amount(total.Q.last, decimalplaces) %]

-    [%- END %]
-  
[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] & [% 'EQUITY' | $T8 %][% LxERP.format_amount(total.this, decimalplaces) %]
[% LxERP.format_amount(total.last, decimalplaces) %]

diff --git a/templates/webpages/rp/html_report_susa.html b/templates/webpages/rp/html_report_susa.html
new file mode 100644
index 000000000..c9b010a78
--- /dev/null
+++ b/templates/webpages/rp/html_report_susa.html
@@ -0,0 +1,121 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+
+ 
+
+ [% IF MESSAGE %]
+  
[% MESSAGE %]

+ [% END %]
+
+ 
[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]

+
+ [% IF TOP_INFO_TEXT %]
+  
[% TOP_INFO_TEXT %]

+ [% END %]
+
+ [% RAW_TOP_INFO_TEXT %]
+
+ [% IF DATA_PRESENT %]
+ 

+  
+   
+     
+     
+     
+     
+     
+     
+     
+   
+   
+    
+    
+    
+    
+    
+    
+    
+    
+   
+   [% FOREACH row = ROWS %]
+    [% IF row.IS_CONTROL %]
+     [% IF row.IS_COLSPAN_DATA %][% END %]
+     [% ELSE %]
+     
+      [%- FOREACH col = row.COLUMNS %]
+      
+       [%- IF col.raw_data %][%- col.raw_data %][%- END %]
+       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+        [%- IF cell_row.data != '' %]
+         [%- IF cell_row.link %][%- END %]
+         [%- cell_row.data %]
+         [%- IF cell_row.link %][%- END %]
+        [%- END %]
+       [%- UNLESS iterator.last %]
[%- END %]
+       [%- END %]
+      
+      [%- END %]
+     
+    [% END %]
+   [% END %]
+
+   
+
+  
[% 'Account' | $T8 %][% 'Description' | $T8 %][% 'Last Transaction' | $T8 %][% 'Starting Balance' | $T8 %][% 'Sum for' | $T8 %] [% template_fromto %][% 'Sum per' | $T8 %] [% template_to %][% 'Saldo per' | $T8 %] [% template_to %]
[% 'Assets' | $T8 %][% 'Equity' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %]
[% row.data %]

+ 

+ [% ELSE %]
+  
[% 'No data was found.' | $T8 %]

+ [% END %]
+
+ [% RAW_BOTTOM_INFO_TEXT %]
+
+ [% IF BOTTOM_INFO_TEXT %]
+  
[% BOTTOM_INFO_TEXT %]

+ [% END %]
+
+ [% IF SHOW_EXPORT_BUTTONS %]
+  
+   [% FOREACH var = EXPORT_VARIABLES %]
+   [% END %]
+
+   
+   
+   
+   
+
+   

+    Listenexport

+    [% IF ALLOW_PDF_EXPORT %][% END %]
+    [% IF ALLOW_CSV_EXPORT %][% END %]
+   

+  

+ [% END %]
+
+
diff --git a/templates/webpages/rp/html_report_susa_master.html b/templates/webpages/rp/html_report_susa_master.html
deleted file mode 100644
index c9b010a78..000000000
--- a/templates/webpages/rp/html_report_susa_master.html
+++ /dev/null
@@ -1,121 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
-
- 
-
- [% IF MESSAGE %]
-  
[% MESSAGE %]

- [% END %]
-
- 
[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]

-
- [% IF TOP_INFO_TEXT %]
-  
[% TOP_INFO_TEXT %]

- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- 

-  
-   
-     
-     
-     
-     
-     
-     
-     
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %][% END %]
-     [% ELSE %]
-     
-      [%- FOREACH col = row.COLUMNS %]
-      
-       [%- IF col.raw_data %][%- col.raw_data %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %][%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %][%- END %]
-        [%- END %]
-       [%- UNLESS iterator.last %]
[%- END %]
-       [%- END %]
-      
-      [%- END %]
-     
-    [% END %]
-   [% END %]
-
-   
-
-  
[% 'Account' | $T8 %][% 'Description' | $T8 %][% 'Last Transaction' | $T8 %][% 'Starting Balance' | $T8 %][% 'Sum for' | $T8 %] [% template_fromto %][% 'Sum per' | $T8 %] [% template_to %][% 'Saldo per' | $T8 %] [% template_to %]
[% 'Assets' | $T8 %][% 'Equity' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %][% 'Debit' | $T8 %][% 'Credit' | $T8 %]
[% row.data %]

- 

- [% ELSE %]
-  
[% 'No data was found.' | $T8 %]

- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  
[% BOTTOM_INFO_TEXT %]

- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  

-   [% FOREACH var = EXPORT_VARIABLES %]
-   [% END %]
-
-   
-   
-   
-   
-
-   

-    Listenexport

-    [% IF ALLOW_PDF_EXPORT %][% END %]
-    [% IF ALLOW_CSV_EXPORT %][% END %]
-   

-  

- [% END %]
-
-
diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
new file mode 100644
index 000000000..4aa4ab9f2
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -0,0 +1,98 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+
+ 
[% title %]

+
+ 

+  

+   [% 'Please select the source bank account for the transfers:' | $T8 %]
+   

+   [%- INCLUDE generic/multibox.html
+         name      = 'bank_account.id',
+         DATA      = BANK_ACCOUNTS,
+         id_key    = 'id',
+         label_sub = 'bank_account_label',
+   -%]
+  

+
+  

+   
+    
+     
+     
+     
+     
+     
+     
+     
+    
+
+    [%- FOREACH invoice = INVOICES %]
+     
+
+     
+      
+      
+
+      
+
+      
+      
+      
+      
+     
+    [%- END %]
+   
[% 'Vendor' | $T8 %][% 'Invoice' | $T8 %][% 'Amount' | $T8 %][% 'Open amount' | $T8 %][% 'Purpose' | $T8 %][% 'Bank transfer amount' | $T8 %]

+       [%- IF invoice.vendor_bank_info_ok %]
+        
+       [%- END %]
+      
+       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
+        
+         [%- GET HTML.escape(invoice.vendorname);
+             SET previous_vendorname = invoice.vendorname;
+             IF !invoice.vendor_bank_info_ok;
+               GET ' (1)';
+               SET show_vendor_bank_info_footnote = '1';
+             END; -%]
+        
+       [%- END -%]
+      
+       
+        [% HTML.escape(invoice.invnumber) %]
+       
+      [% LxERP.format_amount(invoice.invoice_amount, -2) %][% LxERP.format_amount(invoice.open_amount, -2) %]
+       
+      

+  

+
+  [%- IF show_vendor_bank_info_footnote %]
+   

+    (1) [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
+   

+  [%- END %]
+
+  

+   
+  

+
+  
+ 

+
+ 
+ 
+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_add_master.html b/templates/webpages/sepa/bank_transfer_add_master.html
deleted file mode 100644
index 4aa4ab9f2..000000000
--- a/templates/webpages/sepa/bank_transfer_add_master.html
+++ /dev/null
@@ -1,98 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-
- 
[% title %]

-
- 

-  

-   [% 'Please select the source bank account for the transfers:' | $T8 %]
-   

-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  

-
-  

-   
-    
-     
-     
-     
-     
-     
-     
-     
-    
-
-    [%- FOREACH invoice = INVOICES %]
-     
-
-     
-      
-      
-
-      
-
-      
-      
-      
-      
-     
-    [%- END %]
-   
[% 'Vendor' | $T8 %][% 'Invoice' | $T8 %][% 'Amount' | $T8 %][% 'Open amount' | $T8 %][% 'Purpose' | $T8 %][% 'Bank transfer amount' | $T8 %]

-       [%- IF invoice.vendor_bank_info_ok %]
-        
-       [%- END %]
-      
-       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
-        
-         [%- GET HTML.escape(invoice.vendorname);
-             SET previous_vendorname = invoice.vendorname;
-             IF !invoice.vendor_bank_info_ok;
-               GET ' (1)';
-               SET show_vendor_bank_info_footnote = '1';
-             END; -%]
-        
-       [%- END -%]
-      
-       
-        [% HTML.escape(invoice.invnumber) %]
-       
-      [% LxERP.format_amount(invoice.invoice_amount, -2) %][% LxERP.format_amount(invoice.open_amount, -2) %]
-       
-      

-  

-
-  [%- IF show_vendor_bank_info_footnote %]
-   

-    (1) [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
-   

-  [%- END %]
-
-  

-   
-  

-
-  
- 

-
- 
- 
-
-
-
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html
new file mode 100644
index 000000000..318639e2e
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_create.html
@@ -0,0 +1,119 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+
+ [%- IF error_message %]
+ 
[% error_message %]

+ [%- END %]
+
+ 
[% title %]

+
+ 

+  
1. [% 'Please select the source bank account for the transfers:' | $T8 %]
+   

+   [%- INCLUDE generic/multibox.html
+         name      = 'bank_account.id',
+         DATA      = BANK_ACCOUNTS,
+         id_key    = 'id',
+         label_sub = 'bank_account_label',
+   -%]
+  

+
+  

+   2. [% 'Please Check the bank information for each vendor:' | $T8 %]
+   

+   
+    
+     
+     
+     
+     
+    
+
+    [%- FOREACH vbi = VENDOR_BANK_INFO %]
+    
+     
+     
+     
+     
+    
+    [%- END %]
+   
[% 'Vendor' | $T8 %][% 'IBAN' | $T8 %][% 'BIC' | $T8 %][% 'Bank' | $T8 %]

+      
+      
+      [% HTML.escape(vbi.name) %]
+     

+  

+
+  

+   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
+   

+   
+    
+     
+     
+     
+     
+     
+     
+     
+    
+
+    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
+     
+     
+     
+
+     
+      
+
+      
+
+      
+      
+      
+      
+      
+     
+    [%- END %]
+   
[% 'Vendor' | $T8 %][% 'Invoice' | $T8 %][% 'Amount' | $T8 %][% 'Open amount' | $T8 %][% 'Purpose' | $T8 %][% 'Bank transfer amount' | $T8 %][% 'Execution date' | $T8 %]

+       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
+        
+         [%- GET HTML.escape(bank_transfer.vendorname);
+             SET previous_vendorname = bank_transfer.vendorname; -%]
+        
+       [%- END -%]
+      
+       
+        [% HTML.escape(bank_transfer.invnumber) %]
+       
+      [% LxERP.format_amount(bank_transfer.invoice_amount, -2) %][% LxERP.format_amount(bank_transfer.open_amount, -2) %]
+       
+       
+      

+  

+
+  

+   
+  

+
+  
+  
+ 

+
+ 
+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_create_master.html b/templates/webpages/sepa/bank_transfer_create_master.html
deleted file mode 100644
index 318639e2e..000000000
--- a/templates/webpages/sepa/bank_transfer_create_master.html
+++ /dev/null
@@ -1,119 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
-
-
- [%- IF error_message %]
- 
[% error_message %]

- [%- END %]
-
- 
[% title %]

-
- 

-  
1. [% 'Please select the source bank account for the transfers:' | $T8 %]
-   

-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  

-
-  

-   2. [% 'Please Check the bank information for each vendor:' | $T8 %]
-   

-   
-    
-     
-     
-     
-     
-    
-
-    [%- FOREACH vbi = VENDOR_BANK_INFO %]
-    
-     
-     
-     
-     
-    
-    [%- END %]
-   
[% 'Vendor' | $T8 %][% 'IBAN' | $T8 %][% 'BIC' | $T8 %][% 'Bank' | $T8 %]

-      
-      
-      [% HTML.escape(vbi.name) %]
-     

-  

-
-  

-   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
-   

-   
-    
-     
-     
-     
-     
-     
-     
-     
-    
-
-    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
-     
-     
-     
-
-     
-      
-
-      
-
-      
-      
-      
-      
-      
-     
-    [%- END %]
-   
[% 'Vendor' | $T8 %][% 'Invoice' | $T8 %][% 'Amount' | $T8 %][% 'Open amount' | $T8 %][% 'Purpose' | $T8 %][% 'Bank transfer amount' | $T8 %][% 'Execution date' | $T8 %]

-       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
-        
-         [%- GET HTML.escape(bank_transfer.vendorname);
-             SET previous_vendorname = bank_transfer.vendorname; -%]
-        
-       [%- END -%]
-      
-       
-        [% HTML.escape(bank_transfer.invnumber) %]
-       
-      [% LxERP.format_amount(bank_transfer.invoice_amount, -2) %][% LxERP.format_amount(bank_transfer.open_amount, -2) %]
-       
-       
-      

-  

-
-  

-   
-  

-
-  
-  
- 

-
- 
-
-
-
diff --git a/templates/webpages/sepa/bank_transfer_created.html b/templates/webpages/sepa/bank_transfer_created.html
new file mode 100644
index 000000000..d71ae55b8
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_created.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ 
[% title %]

+
+ 

+  [% 'The SEPA export has been created.' | $T8 %]
+ 

+
+ 

+  

+ 

+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_created_master.html b/templates/webpages/sepa/bank_transfer_created_master.html
deleted file mode 100644
index d71ae55b8..000000000
--- a/templates/webpages/sepa/bank_transfer_created_master.html
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- 
[% title %]

-
- 

-  [% 'The SEPA export has been created.' | $T8 %]
- 

-
- 

-  

- 

-
-
-
diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
new file mode 100644
index 000000000..28b17edf5
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_edit.html
@@ -0,0 +1,141 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+
+ 
[% title %]: [% HTML.escape(export.ids.join(', ')) %]

+
+ 

+  
+
+  

+   
+    
+     [%- IF show_post_payments_button %]
+      
+     [%- END %]
+     
+     
+     
+     
+     
+     
+     
+     
+    
+    
+     
+     
+     
+     
+     
+     [%- IF show_post_payments_button %]
+      
+      
+     [%- ELSE %]
+      
+     [%- END %]
+    
+
+    [%- FOREACH item = export.items %]
+     
+      [%- IF show_post_payments_button %]
+       
+       
+       
+      [%- END %]
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+     
+    [%- END %]
+   
[% 'Invoice' | $T8 %][% 'Vendor' | $T8 %][% 'Source bank account' | $T8 %][% 'Target bank account' | $T8 %][% 'Amount' | $T8 %][% 'Reference' | $T8 %][% 'Requested execution date' | $T8 %][% 'Execution date' | $T8 %]
 [% 'IBAN' | $T8 %][% 'BIC' | $T8 %][% 'IBAN' | $T8 %][% 'BIC' | $T8 %] 
+       
+       
+       

+        [%- UNLESS item.executed %]
+        
+        [%- END %]
+       
+       [% HTML.escape(item.invnumber) %]
+      [% HTML.escape(item.vendor_name) %][% HTML.escape(item.our_iban) %][% HTML.escape(item.our_bic) %][% HTML.escape(item.vendor_iban) %][% HTML.escape(item.vendor_bic) %][% HTML.escape(LxERP.format_amount(item.amount, 2)) %][% HTML.escape(item.reference) %][% HTML.escape(item.requested_execution_date) %]
+       [%- IF item.executed %]
+        [% HTML.escape(item.execution_date) %]
+       [%- ELSIF item.export_closed %]
+        [% 'not executed' | $T8 %]
+       [%- ELSE %]
+        
+        
+       [%- END %]
+      

+  

+
+  

+
+  [%- IF show_post_payments_button %]
+  

+   
+  

+
+  
+  
+
+  [%- ELSE %]
+  

+   
+  

+
+   [%- FOREACH item = export.items %]
+    [%- IF item.executed %]
+     
+     
+    [%- END %]
+   [%- END %]
+  [%- END %]
+ 

+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_edit_master.html b/templates/webpages/sepa/bank_transfer_edit_master.html
deleted file mode 100644
index 28b17edf5..000000000
--- a/templates/webpages/sepa/bank_transfer_edit_master.html
+++ /dev/null
@@ -1,141 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-[% USE LxERP %]
-
-
- 
[% title %]: [% HTML.escape(export.ids.join(', ')) %]

-
- 

-  
-
-  

-   
-    
-     [%- IF show_post_payments_button %]
-      
-     [%- END %]
-     
-     
-     
-     
-     
-     
-     
-     
-    
-    
-     
-     
-     
-     
-     
-     [%- IF show_post_payments_button %]
-      
-      
-     [%- ELSE %]
-      
-     [%- END %]
-    
-
-    [%- FOREACH item = export.items %]
-     
-      [%- IF show_post_payments_button %]
-       
-       
-       
-      [%- END %]
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-     
-    [%- END %]
-   
[% 'Invoice' | $T8 %][% 'Vendor' | $T8 %][% 'Source bank account' | $T8 %][% 'Target bank account' | $T8 %][% 'Amount' | $T8 %][% 'Reference' | $T8 %][% 'Requested execution date' | $T8 %][% 'Execution date' | $T8 %]
 [% 'IBAN' | $T8 %][% 'BIC' | $T8 %][% 'IBAN' | $T8 %][% 'BIC' | $T8 %] 
-       
-       
-       

-        [%- UNLESS item.executed %]
-        
-        [%- END %]
-       
-       [% HTML.escape(item.invnumber) %]
-      [% HTML.escape(item.vendor_name) %][% HTML.escape(item.our_iban) %][% HTML.escape(item.our_bic) %][% HTML.escape(item.vendor_iban) %][% HTML.escape(item.vendor_bic) %][% HTML.escape(LxERP.format_amount(item.amount, 2)) %][% HTML.escape(item.reference) %][% HTML.escape(item.requested_execution_date) %]
-       [%- IF item.executed %]
-        [% HTML.escape(item.execution_date) %]
-       [%- ELSIF item.export_closed %]
-        [% 'not executed' | $T8 %]
-       [%- ELSE %]
-        
-        
-       [%- END %]
-      

-  

-
-  

-
-  [%- IF show_post_payments_button %]
-  

-   
-  

-
-  
-  
-
-  [%- ELSE %]
-  

-   
-  

-
-   [%- FOREACH item = export.items %]
-    [%- IF item.executed %]
-     
-     
-    [%- END %]
-   [%- END %]
-  [%- END %]
- 

-
-
-
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom.html b/templates/webpages/sepa/bank_transfer_list_bottom.html
new file mode 100644
index 000000000..79f373f2c
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_list_bottom.html
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+[%- IF show_buttons %]
+ 
+ 
+
+ 

+  
+  
+  
+ 

+
+ 
+ 
+[%- END %]
+
+
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom_master.html b/templates/webpages/sepa/bank_transfer_list_bottom_master.html
deleted file mode 100644
index 79f373f2c..000000000
--- a/templates/webpages/sepa/bank_transfer_list_bottom_master.html
+++ /dev/null
@@ -1,29 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-[%- IF show_buttons %]
- 
- 
-
- 

-  
-  
-  
- 

-
- 
- 
-[%- END %]
-
-
diff --git a/templates/webpages/sepa/bank_transfer_list_top.html b/templates/webpages/sepa/bank_transfer_list_top.html
new file mode 100644
index 000000000..f17b45614
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_list_top.html
@@ -0,0 +1 @@
+

diff --git a/templates/webpages/sepa/bank_transfer_list_top_master.html b/templates/webpages/sepa/bank_transfer_list_top_master.html
deleted file mode 100644
index f17b45614..000000000
--- a/templates/webpages/sepa/bank_transfer_list_top_master.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html
new file mode 100644
index 000000000..4d1a6dcf2
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html
@@ -0,0 +1,30 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ 
[% title %]

+
+ 
+  

+   [%- 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven\'t been marked as executed yet.' | $T8 %]
+  

+
+  

+   [% 'SEPA exports:' | $T8 %]
+   [%- FOREACH id = OPEN_EXPORT_IDS %]
+    [%- UNLESS loop.first %], [%- END %]
+    
+    [% HTML.escape(id) %]
+   [%- END %]
+  

+
+  

+   
+   
+  

+
+  
+ 

+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
deleted file mode 100644
index 4d1a6dcf2..000000000
--- a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
+++ /dev/null
@@ -1,30 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- 
[% title %]

-
- 

-  

-   [%- 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven\'t been marked as executed yet.' | $T8 %]
-  

-
-  

-   [% 'SEPA exports:' | $T8 %]
-   [%- FOREACH id = OPEN_EXPORT_IDS %]
-    [%- UNLESS loop.first %], [%- END %]
-    
-    [% HTML.escape(id) %]
-   [%- END %]
-  

-
-  

-   
-   
-  

-
-  
- 

-
-
-
diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html
new file mode 100644
index 000000000..306179fe5
--- /dev/null
+++ b/templates/webpages/sepa/bank_transfer_search.html
@@ -0,0 +1,126 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+ 
[% title %]

+
+ 

+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+   
[% 'Vendor' | $T8 %]
[% 'Invoice number' | $T8 %]
[% 'Export date from' | $T8 %]
+      
+      
+      [% 'to (time)' | $T8 %]
+      
+      
+     
[% 'Requested execution date from' | $T8 %]
+      
+      
+      [% 'to (time)' | $T8 %]
+      
+      
+     
[% 'Execution date from' | $T8 %]
+      
+      
+      [% 'to (time)' | $T8 %]
+      
+      
+     
[% 'Include in Report' | $T8 %]
+      
+       
+        
+
+        
+       
+
+       
+        
+
+        
+       
+      

+         
+         
+        
+         
+         
+        

+         
+         
+        
+         
+         
+        

+     

+  

+
+  

+   
+   
+  

+ 

+
+ 
+
+
+
diff --git a/templates/webpages/sepa/bank_transfer_search_master.html b/templates/webpages/sepa/bank_transfer_search_master.html
deleted file mode 100644
index 306179fe5..000000000
--- a/templates/webpages/sepa/bank_transfer_search_master.html
+++ /dev/null
@@ -1,126 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
- 
[% title %]

-
- 

-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-   
[% 'Vendor' | $T8 %]
[% 'Invoice number' | $T8 %]
[% 'Export date from' | $T8 %]
-      
-      
-      [% 'to (time)' | $T8 %]
-      
-      
-     
[% 'Requested execution date from' | $T8 %]
-      
-      
-      [% 'to (time)' | $T8 %]
-      
-      
-     
[% 'Execution date from' | $T8 %]
-      
-      
-      [% 'to (time)' | $T8 %]
-      
-      
-     
[% 'Include in Report' | $T8 %]
-      
-       
-        
-
-        
-       
-
-       
-        
-
-        
-       
-      

-         
-         
-        
-         
-         
-        

-         
-         
-        
-         
-         
-        

-     

-  

-
-  

-   
-   
-  

- 

-
- 
-
-
-
diff --git a/templates/webpages/todo/show_todo_list.html b/templates/webpages/todo/show_todo_list.html
new file mode 100644
index 000000000..8d6a137df
--- /dev/null
+++ b/templates/webpages/todo/show_todo_list.html
@@ -0,0 +1,18 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
[% 'Your TODO list' | $T8 %]

+
+ [%- IF !todo_list %]
+ 

+  [% 'There are no items on your TODO list at the moment.' | $T8 %]
+ 

+
+ [%- ELSE %]
+
+ [%- todo_list %]
+
+ [%- END %]
+
+
+
diff --git a/templates/webpages/todo/show_todo_list_master.html b/templates/webpages/todo/show_todo_list_master.html
deleted file mode 100644
index 8d6a137df..000000000
--- a/templates/webpages/todo/show_todo_list_master.html
+++ /dev/null
@@ -1,18 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
[% 'Your TODO list' | $T8 %]

-
- [%- IF !todo_list %]
- 

-  [% 'There are no items on your TODO list at the moment.' | $T8 %]
- 

-
- [%- ELSE %]
-
- [%- todo_list %]
-
- [%- END %]
-
-
-
diff --git a/templates/webpages/ustva/config_step1.html b/templates/webpages/ustva/config_step1.html
new file mode 100644
index 000000000..0d1a74ac3
--- /dev/null
+++ b/templates/webpages/ustva/config_step1.html
@@ -0,0 +1,114 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+

+
+   
+      
+    
+    
+     
+       
+     
[% 'Tax Office Preferences' | $T8 %]

+       

+[%- IF COA_Germany %]
+       

+       [% 'Local Tax Office Preferences' | $T8 %]
+       

+       [% select_tax_office %]
+       

+       

+[%- END %]
+       

+       [% 'Taxation' | $T8 %]
+       
+       
+       
+       

+       
+       
+       

+       

+       

+       [% 'Tax Period' | $T8 %]
+       
+
+
+           
+           
+           

+           
+           
+           

+           
+           
+
+           

+           

+           

+           [% 'Tax Consultant' | $T8 %]
+           
+          
+           
+           
+           
+           
+           
+           
+           
+           
+           
+           
+           
+           
+           

+           [% 'Name' | $T8 %]
+           
+           [% 'Street' | $T8 %]
+           
+           [% 'Zip, City' | $T8 %]
+           
+           [% 'Telephone' | $T8 %]
+           

+           
+           
+           
+           
+           
+           
+           
+           

+
+           

+
+           

+           

+           

+           
+           
+         

+
+     [%- FOREACH var = hidden_variables %]
+       
+     [%- END %]
+  

+
diff --git a/templates/webpages/ustva/config_step1_master.html b/templates/webpages/ustva/config_step1_master.html
deleted file mode 100644
index 0d1a74ac3..000000000
--- a/templates/webpages/ustva/config_step1_master.html
+++ /dev/null
@@ -1,114 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-

-
-   
-      
-    
-    
-     
-       
-     
[% 'Tax Office Preferences' | $T8 %]

-       

-[%- IF COA_Germany %]
-       

-       [% 'Local Tax Office Preferences' | $T8 %]
-       

-       [% select_tax_office %]
-       

-       

-[%- END %]
-       

-       [% 'Taxation' | $T8 %]
-       
-       
-       
-       

-       
-       
-       

-       

-       

-       [% 'Tax Period' | $T8 %]
-       
-
-
-           
-           
-           

-           
-           
-           

-           
-           
-
-           

-           

-           

-           [% 'Tax Consultant' | $T8 %]
-           
-          
-           
-           
-           
-           
-           
-           
-           
-           
-           
-           
-           
-           
-           

-           [% 'Name' | $T8 %]
-           
-           [% 'Street' | $T8 %]
-           
-           [% 'Zip, City' | $T8 %]
-           
-           [% 'Telephone' | $T8 %]
-           

-           
-           
-           
-           
-           
-           
-           
-           

-
-           

-
-           

-           

-           

-           
-           
-         

-
-     [%- FOREACH var = hidden_variables %]
-       
-     [%- END %]
-  

-
diff --git a/templates/webpages/ustva/config_step2.html b/templates/webpages/ustva/config_step2.html
new file mode 100644
index 000000000..c8a5a8e56
--- /dev/null
+++ b/templates/webpages/ustva/config_step2.html
@@ -0,0 +1,215 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
+
+  

+    
+       
+         
+       
+       
+         
+       
+       
+         
+       
+       
+         
+         
+      
+  

+           [% 'Tax Office Preferences' | $T8 %]

+           

+           
+           

+           

+             
+               [% 'Tax Office' | $T8 %]
+               [% HTML.escape(FA_Name) %]
+             
+             
+                
+                  
+                  
+       
+    

+                    

+                    

+                      
+                      [% 'Address' | $T8 %]
+                      
+                      
+                        
+                          
+                        
+                        
+                          
+                        
+                          
+                        
+                        
+                          
+                          
+                        
+                      

+                            [% 'Tax Office' | $T8 %]
+                          

+                            
+                          
+                        

+                            
+                          

+                            
+                          
+                            
+                          

+                    

+                    

+                    

+                      
+                        [% 'Contact' | $T8 %]
+                      
+                        [% 'Telephone' | $T8 %]

+                        
+                        

+                        

+                        [% 'Fax' | $T8 %]

+                        
+                        

+                        

+                        [% 'Internet' | $T8 %]

+                        
+                        

+                        

+                        
+                        

+                    

+                  		
+                    

+                    

+                    
+                    [% 'Openings' | $T8 %]
+                    
+                    
+                    

+                    

+                      

+                      
+                        [% 'Bank Connection Tax Office' | $T8 %]
+                      
+                      
+                      
+                        
+                        
+                   
+             

+                          [% 'Bank' | $T8 %]
+                          

+                          
+                          

+                          

+                          [% 'Account Nummer' | $T8 %]
+                          

+                          
+                          

+                          

+                          [% 'Bank Code (long)' | $T8 %]
+                          

+                          
+                        		
+                          [% 'Bank' | $T8 %]
+                          

+                          
+                          

+                          

+                          [% 'Account Nummer' | $T8 %]
+                          

+                          
+                          

+                          

+                          [% 'Bank Code (long)' | $T8 %]
+                          

+                          
+                        

+           

+         

+  

+
+
+
+        

+           

+           

+           
+           [% 'Tax Number' | $T8 %]
+           
+           

+[%- IF COA_Germany %]
+           [% input_steuernummer %]
+[%- ELSE %]
+[% 'Please enter the taxnumber in the administration menu userpreferences' | $T8 %]
+[% 'Current value:' | $T8 %] [% HTML.escape(myconfig_taxnumber) %]
+[%- END %]
+
+
+           

+           

+           

+           

+           

+         

+
+          [%- IF callback %]
+           
+          [%- ELSE %]
+            
+          [%- END %]
+
+          [%- IF warnung %]
+
+            
+            
+
+            
+
+          [%- ELSE %]
+
+            
+            
+            
+
+          [%- END %]
+
+         
+           
[%- saved %]

+         

+
+[%- FOREACH var = hidden_variables %]
+  
+[%- END %]
+
+
+  

+
+
diff --git a/templates/webpages/ustva/config_step2_master.html b/templates/webpages/ustva/config_step2_master.html
deleted file mode 100644
index c8a5a8e56..000000000
--- a/templates/webpages/ustva/config_step2_master.html
+++ /dev/null
@@ -1,215 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
-
-  

-    
-       
-         
-       
-       
-         
-       
-       
-         
-       
-       
-         
-         
-      
-  

-           [% 'Tax Office Preferences' | $T8 %]

-           

-           
-           

-           

-             
-               [% 'Tax Office' | $T8 %]
-               [% HTML.escape(FA_Name) %]
-             
-             
-                
-                  
-                  
-       
-    

-                    

-                    

-                      
-                      [% 'Address' | $T8 %]
-                      
-                      
-                        
-                          
-                        
-                        
-                          
-                        
-                          
-                        
-                        
-                          
-                          
-                        
-                      

-                            [% 'Tax Office' | $T8 %]
-                          

-                            
-                          
-                        

-                            
-                          

-                            
-                          
-                            
-                          

-                    

-                    

-                    

-                      
-                        [% 'Contact' | $T8 %]
-                      
-                        [% 'Telephone' | $T8 %]

-                        
-                        

-                        

-                        [% 'Fax' | $T8 %]

-                        
-                        

-                        

-                        [% 'Internet' | $T8 %]

-                        
-                        

-                        

-                        
-                        

-                    

-                  		
-                    

-                    

-                    
-                    [% 'Openings' | $T8 %]
-                    
-                    
-                    

-                    

-                      

-                      
-                        [% 'Bank Connection Tax Office' | $T8 %]
-                      
-                      
-                      
-                        
-                        
-                   
-             

-                          [% 'Bank' | $T8 %]
-                          

-                          
-                          

-                          

-                          [% 'Account Nummer' | $T8 %]
-                          

-                          
-                          

-                          

-                          [% 'Bank Code (long)' | $T8 %]
-                          

-                          
-                        		
-                          [% 'Bank' | $T8 %]
-                          

-                          
-                          

-                          

-                          [% 'Account Nummer' | $T8 %]
-                          

-                          
-                          

-                          

-                          [% 'Bank Code (long)' | $T8 %]
-                          

-                          
-                        

-           

-         

-  

-
-
-
-        

-           

-           

-           
-           [% 'Tax Number' | $T8 %]
-           
-           

-[%- IF COA_Germany %]
-           [% input_steuernummer %]
-[%- ELSE %]
-[% 'Please enter the taxnumber in the administration menu userpreferences' | $T8 %]
-[% 'Current value:' | $T8 %] [% HTML.escape(myconfig_taxnumber) %]
-[%- END %]
-
-
-           

-           

-           

-           

-           

-         

-
-          [%- IF callback %]
-           
-          [%- ELSE %]
-            
-          [%- END %]
-
-          [%- IF warnung %]
-
-            
-            
-
-            
-
-          [%- ELSE %]
-
-            
-            
-            
-
-          [%- END %]
-
-         
-           
[%- saved %]

-         

-
-[%- FOREACH var = hidden_variables %]
-  
-[%- END %]
-
-
-  

-
-
diff --git a/templates/webpages/ustva/generic_taxreport.html b/templates/webpages/ustva/generic_taxreport.html
new file mode 100644
index 000000000..e5ee4900c
--- /dev/null
+++ b/templates/webpages/ustva/generic_taxreport.html
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+
[% 'Generic Tax Report' | $T8 %]

+
[% 'Taxnumber' | $T8 %]: [% taxnumber %]

+
[% 'Year' | $T8 %]: [% year %]

+
[% 'Period' | $T8 %]: [% period %]

+

+
+  
+    
+    
+  
+[% FOREACH row = USTVA %]
+  
+
+    
+    
+  
+[% END %]
+
+
[% 'Tax Position' | $T8 %][% 'Amount' | $T8 %]
[% HTML.escape(row.id) %][% HTML.escape(row.amount) %]

+
+
+
diff --git a/templates/webpages/ustva/generic_taxreport_master.html b/templates/webpages/ustva/generic_taxreport_master.html
deleted file mode 100644
index e5ee4900c..000000000
--- a/templates/webpages/ustva/generic_taxreport_master.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-
[% 'Generic Tax Report' | $T8 %]

-
[% 'Taxnumber' | $T8 %]: [% taxnumber %]

-
[% 'Year' | $T8 %]: [% year %]

-
[% 'Period' | $T8 %]: [% period %]

-

-
-  
-    
-    
-  
-[% FOREACH row = USTVA %]
-  
-
-    
-    
-  
-[% END %]
-
-
[% 'Tax Position' | $T8 %][% 'Amount' | $T8 %]
[% HTML.escape(row.id) %][% HTML.escape(row.amount) %]

-
-
-
diff --git a/templates/webpages/ustva/report.html b/templates/webpages/ustva/report.html
new file mode 100644
index 000000000..a397e13fe
--- /dev/null
+++ b/templates/webpages/ustva/report.html
@@ -0,0 +1,207 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+ 
+ 

+
+ 
+
+ 
+  
+    
+  
+  
+  
+    
+    
+    
+     
+    
+  
[% HTML.escape(title) %]

+      
+        
+          
+          
+        
+      

+            

+            
+            [% 'Company' | $T8 %]
+            
+
+            [% company_given %]
+            [% address_given %]
+
+            

+            

+            [% 'Tel' | $T8 %].: 
+            [% HTML.escape(co_tel) %]
+            

+            [% 'Fax' | $T8 %].: 
+            [% HTML.escape(co_fax) %]
+            

+            

+            [% HTML.escape(co_email) %]
+            

+            

+
+            [% 'Tax Number' | $T8 %]: 
+[%- IF COA_Germany %]
+            [% taxnumber_given %]
+            

+            [% 'ELSTER Tax Number' | $T8 %]: 
+            [% HTML.escape(elstersteuernummer) %]
+            

+            

+[%- ELSE %]
+            [% taxnumber %]
+[%- END %]
+            

+            

+
+            [%- IF FA_steuerberater_name %]
+              

+              
+                
+                  [% 'Tax Consultant' | $T8 %]
+                
+
+                [% HTML.escape(FA_steuerberater_name) %]

+                [% HTML.escape(FA_steuerberater_street) %]

+                [% HTML.escape(FA_steuerberater_city) %]

+                [% 'Tel.' | $T8 %] [% HTML.escape(FA_steuerberater_tel) %]

+              

+              

+            [%- END %]
+
+            

+            
+            [% 'Tax Period' | $T8 %]
+            
+            [% select_year %] [% ustva_vorauswahl %]
+            [% checkbox_kz_10 %]
+            

+            [%- IF FA_voranmeld %]
+              

+              [% period_local %]
+              [%- IF FA_dauerfrist %]
+                [% 'With Extension Of Time' | $T8 %]
+              [%- END %]
+              

+            [%- END %]
+
+            [%- IF method_local %]
+              [% 'Method' | $T8 %]: [% method_local %]
+            [%- END %]
+            

+          		
+              

+              
+                 [% 'Tax Office' | $T8 %]
+              
+              
[% HTML.escape(FA_Name) %]

+
+              [% HTML.escape(FA_Strasse) %]
+              

+              [% HTML.escape(FA_PLZ) %]   [% HTML.escape(FA_Ort) %]
+              

+              

+              [% 'Tel' | $T8 %].: 
+              [% HTML.escape(FA_Telefon) %]
+              

+              [% 'Fax' | $T8 %].: 
+              [% HTML.escape(FA_Fax) %]
+              

+              

+              
+              
+              [% HTML.escape(FA_Email) %]
+              
+              

+              
+              [% HTML.escape(FA_Internet) %]
+              
+              

+              

+              [% 'Openings' | $T8 %]
+              

+              [% openings %]
+              

+              

+              [% 'Bank Connections' | $T8 %]
+              
+              
+
+              [%- FOREACH row = "tax_office_banks" %]
+                  
+              [%- END %]
+
+              
+              

+                  [% HTML.escape(row.Bankbezeichnung) %]
+                  

+                  [% 'Account' | $T8 %]: 
+                  [% HTML.escape(row.Kontonummer) %]
+                  

+                  [% 'Bank Code' | $T8 %]: 
+                  [% HTML.escape(row.BLZ) %]
+                  

+              

+              

+
+              

+
+              

+              
+              [% 'Outputformat' | $T8 %]
+              
+[%- IF COA_Germany %]
+              [% select_options %]
+[%- ELSE %]
+              
+[%- END %]
+
+              

+          

+     

+
+  

+  
+  
+  
+  
+  
+  
+   
+   
+  
+  

+     
+     
+   
+
+    
+    
+   

+
+
diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html
deleted file mode 100644
index a397e13fe..000000000
--- a/templates/webpages/ustva/report_master.html
+++ /dev/null
@@ -1,207 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
- 
- 

-
- 
-
- 
-  
-    
-  
-  
-  
-    
-    
-    
-     
-    
-  
[% HTML.escape(title) %]

-      
-        
-          
-          
-        
-      

-            

-            
-            [% 'Company' | $T8 %]
-            
-
-            [% company_given %]
-            [% address_given %]
-
-            

-            

-            [% 'Tel' | $T8 %].: 
-            [% HTML.escape(co_tel) %]
-            

-            [% 'Fax' | $T8 %].: 
-            [% HTML.escape(co_fax) %]
-            

-            

-            [% HTML.escape(co_email) %]
-            

-            

-
-            [% 'Tax Number' | $T8 %]: 
-[%- IF COA_Germany %]
-            [% taxnumber_given %]
-            

-            [% 'ELSTER Tax Number' | $T8 %]: 
-            [% HTML.escape(elstersteuernummer) %]
-            

-            

-[%- ELSE %]
-            [% taxnumber %]
-[%- END %]
-            

-            

-
-            [%- IF FA_steuerberater_name %]
-              

-              
-                
-                  [% 'Tax Consultant' | $T8 %]
-                
-
-                [% HTML.escape(FA_steuerberater_name) %]

-                [% HTML.escape(FA_steuerberater_street) %]

-                [% HTML.escape(FA_steuerberater_city) %]

-                [% 'Tel.' | $T8 %] [% HTML.escape(FA_steuerberater_tel) %]

-              

-              

-            [%- END %]
-
-            

-            
-            [% 'Tax Period' | $T8 %]
-            
-            [% select_year %] [% ustva_vorauswahl %]
-            [% checkbox_kz_10 %]
-            

-            [%- IF FA_voranmeld %]
-              

-              [% period_local %]
-              [%- IF FA_dauerfrist %]
-                [% 'With Extension Of Time' | $T8 %]
-              [%- END %]
-              

-            [%- END %]
-
-            [%- IF method_local %]
-              [% 'Method' | $T8 %]: [% method_local %]
-            [%- END %]
-            

-          		
-              

-              
-                 [% 'Tax Office' | $T8 %]
-              
-              
[% HTML.escape(FA_Name) %]

-
-              [% HTML.escape(FA_Strasse) %]
-              

-              [% HTML.escape(FA_PLZ) %]   [% HTML.escape(FA_Ort) %]
-              

-              

-              [% 'Tel' | $T8 %].: 
-              [% HTML.escape(FA_Telefon) %]
-              

-              [% 'Fax' | $T8 %].: 
-              [% HTML.escape(FA_Fax) %]
-              

-              

-              
-              
-              [% HTML.escape(FA_Email) %]
-              
-              

-              
-              [% HTML.escape(FA_Internet) %]
-              
-              

-              

-              [% 'Openings' | $T8 %]
-              

-              [% openings %]
-              

-              

-              [% 'Bank Connections' | $T8 %]
-              
-              
-
-              [%- FOREACH row = "tax_office_banks" %]
-                  
-              [%- END %]
-
-              
-              

-                  [% HTML.escape(row.Bankbezeichnung) %]
-                  

-                  [% 'Account' | $T8 %]: 
-                  [% HTML.escape(row.Kontonummer) %]
-                  

-                  [% 'Bank Code' | $T8 %]: 
-                  [% HTML.escape(row.BLZ) %]
-                  

-              

-              

-
-              

-
-              

-              
-              [% 'Outputformat' | $T8 %]
-              
-[%- IF COA_Germany %]
-              [% select_options %]
-[%- ELSE %]
-              
-[%- END %]
-
-              

-          

-     

-
-  

-  
-  
-  
-  
-  
-  
-   
-   
-  
-  

-     
-     
-   
-
-    
-    
-   

-
-
diff --git a/templates/webpages/webdav/_list.html b/templates/webpages/webdav/_list.html
new file mode 100644
index 000000000..3432fc614
--- /dev/null
+++ b/templates/webpages/webdav/_list.html
@@ -0,0 +1,22 @@
+
+[%- IF webdav %]
+  
+   

+  
+  
+   Dokumente im Webdav-Repository
+  
+   
+    
+     
+     
+    
+ [%- FOREACH file = WEBDAV %]
+    
+     
+     
+    
+ [%- END %]
+   
DateinameWebdavlink
[% file.name %][% file.type %]

+  
+[% END %]
diff --git a/templates/webpages/webdav/_list_master.html b/templates/webpages/webdav/_list_master.html
deleted file mode 100644
index 3432fc614..000000000
--- a/templates/webpages/webdav/_list_master.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[%- IF webdav %]
-  
-   

-  
-  
-   Dokumente im Webdav-Repository
-  
-   
-    
-     
-     
-    
- [%- FOREACH file = WEBDAV %]
-    
-     
-     
-    
- [%- END %]
-   
DateinameWebdavlink
[% file.name %][% file.type %]

-  
-[% END %]
diff --git a/templates/webpages/wh/journal_filter.html b/templates/webpages/wh/journal_filter.html
new file mode 100644
index 000000000..83ba78b50
--- /dev/null
+++ b/templates/webpages/wh/journal_filter.html
@@ -0,0 +1,242 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]
+
+ 
+
+ 
[% 'Report about wareouse transactions' | $T8 %]

+
+ 

+
+  
+
+  

+   
+    
+     
+    
+
+    
+     
+    
+
+    
+
+    
+     
+    
+
+    
+     
+    
+   
[% 'Filter' | $T8 %]

+      
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       [% IF conf_show_best_before %]
+       
+        
+        
+       
+       [% END %]
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+      
[% 'Warehouse' | $T8 %]:
+         
+        
[% 'Bin' | $T8 %]:
[% 'Part Number' | $T8 %]:
[% 'Part Description' | $T8 %]:
[% 'Charge Number' | $T8 %]:
[% 'Best Before' | $T8 %]:
+         
+         
+        
[% 'Transfer Quantity' | $T8 %]:
+         
+         
+         
+        
[% 'From Date' | $T8 %]
+         
+         
+        
[% 'To Date' | $T8 %]
+         
+         
+        

+     
 
[% 'Include in Report' | $T8 %]

+      
+       
+        
+        
+        
+        
+       
+       
+        
+        
+        
+        
+        
+        
+        [% IF conf_show_best_before %]
+        
+        
+        [% END %]
+       
+       
+        
+        
+        
+        
+        
+        
+       
+       
+        
+        
+        
+        
+        
+        
+        
+        
+       
+       
+        
+        
+        
+        
+        
+        
+       
+      

+     

+  

+
+  

+   
+  

+ 

+
+  
+
+
+
diff --git a/templates/webpages/wh/journal_filter_master.html b/templates/webpages/wh/journal_filter_master.html
deleted file mode 100644
index 83ba78b50..000000000
--- a/templates/webpages/wh/journal_filter_master.html
+++ /dev/null
@@ -1,242 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %]
-
- 
-
- 
[% 'Report about wareouse transactions' | $T8 %]

-
- 

-
-  
-
-  

-   
-    
-     
-    
-
-    
-     
-    
-
-    
-
-    
-     
-    
-
-    
-     
-    
-   
[% 'Filter' | $T8 %]

-      
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       [% IF conf_show_best_before %]
-       
-        
-        
-       
-       [% END %]
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-      
[% 'Warehouse' | $T8 %]:
-         
-        
[% 'Bin' | $T8 %]:
[% 'Part Number' | $T8 %]:
[% 'Part Description' | $T8 %]:
[% 'Charge Number' | $T8 %]:
[% 'Best Before' | $T8 %]:
-         
-         
-        
[% 'Transfer Quantity' | $T8 %]:
-         
-         
-         
-        
[% 'From Date' | $T8 %]
-         
-         
-        
[% 'To Date' | $T8 %]
-         
-         
-        

-     
 
[% 'Include in Report' | $T8 %]

-      
-       
-        
-        
-        
-        
-       
-       
-        
-        
-        
-        
-        
-        
-        [% IF conf_show_best_before %]
-        
-        
-        [% END %]
-       
-       
-        
-        
-        
-        
-        
-        
-       
-       
-        
-        
-        
-        
-        
-        
-        
-        
-       
-       
-        
-        
-        
-        
-        
-        
-       
-      

-     

-  

-
-  

-   
-  

- 

-
-  
-
-
-
diff --git a/templates/webpages/wh/removal_parts_selection.html b/templates/webpages/wh/removal_parts_selection.html
new file mode 100644
index 000000000..f156cb7e4
--- /dev/null
+++ b/templates/webpages/wh/removal_parts_selection.html
@@ -0,0 +1,89 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]
+
+ 

+
+  
+  
+
+  
[% title %]

+
+  
[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+   
[% 'Select type of removal' | $T8 %]:
+      
+     
[% 'Optional comment' | $T8 %]:

+  

+
+  

+   
+    
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+    
+
+    [% FOREACH row = CONTENTS %]
+    
+     
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+    
+
+    [% END %]
+
+    
+
+    
+
+   
[% 'Bin' | $T8 %][% 'Part Number' | $T8 %][% 'Part Description' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %][% 'Available qty' | $T8 %][% 'Removal qty' | $T8 %]
[% HTML.escape(row.bindescription) %][% HTML.escape(row.partnumber) %][% HTML.escape(row.partdescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(row.ean) %][% HTML.escape(row.qty) %]
+      
+      
+     

+  

+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/wh/removal_parts_selection_master.html b/templates/webpages/wh/removal_parts_selection_master.html
deleted file mode 100644
index f156cb7e4..000000000
--- a/templates/webpages/wh/removal_parts_selection_master.html
+++ /dev/null
@@ -1,89 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %]
-
- 

-
-  
-  
-
-  
[% title %]

-
-  
[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-   
[% 'Select type of removal' | $T8 %]:
-      
-     
[% 'Optional comment' | $T8 %]:

-  

-
-  

-   
-    
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-    
-
-    [% FOREACH row = CONTENTS %]
-    
-     
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-    
-
-    [% END %]
-
-    
-
-    
-
-   
[% 'Bin' | $T8 %][% 'Part Number' | $T8 %][% 'Part Description' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %][% 'Available qty' | $T8 %][% 'Removal qty' | $T8 %]
[% HTML.escape(row.bindescription) %][% HTML.escape(row.partnumber) %][% HTML.escape(row.partdescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(row.ean) %][% HTML.escape(row.qty) %]
-      
-      
-     

-  

-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
new file mode 100644
index 000000000..e0ef8872a
--- /dev/null
+++ b/templates/webpages/wh/report_filter.html
@@ -0,0 +1,205 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]
+
+ 
+
+ 
[% 'Report about wareouse contents' | $T8 %]

+
+ 

+
+  
+
+  

+   
+    
+     
+    
+
+    
+     
+    
+
+    
+
+    
+     
+    
+
+    
+     
+    
+   
[% 'Filter' | $T8 %]

+      
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       
+        
+        
+       
+       [% IF conf_show_best_before %]
+       
+        
+        
+       
+       [% END %]
+       
+        
+        
+       
+      
[% 'Warehouse' | $T8 %]:
+         
+        
[% 'Bin' | $T8 %]:
[% 'Part Number' | $T8 %]:
[% 'Part Description' | $T8 %]:
[% 'Charge Number' | $T8 %]:
[% 'Best Before' | $T8 %]:
+         
+         
+        
[% 'Qty in stock' | $T8 %]:
+         
+         
+         
+        

+     
 
[% 'Include in Report' | $T8 %]

+      
+      
+
+      
+       
+        
+        
+        
+        
+       
+
+       
+        
+        
+        
+        
+        [% IF conf_show_best_before %]
+        
+        
+        [% END %]
+       
+
+       
+
+       
+        
+        
+        
+        
+       
+
+       
+        
+        
+       
+
+      

+     

+  

+
+  

+   
+  

+ 

+
+ [% IF conf_show_best_before %]
+ 
+ [% END %]
+
+
+
diff --git a/templates/webpages/wh/report_filter_master.html b/templates/webpages/wh/report_filter_master.html
deleted file mode 100644
index e0ef8872a..000000000
--- a/templates/webpages/wh/report_filter_master.html
+++ /dev/null
@@ -1,205 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %]
-
- 
-
- 
[% 'Report about wareouse contents' | $T8 %]

-
- 

-
-  
-
-  

-   
-    
-     
-    
-
-    
-     
-    
-
-    
-
-    
-     
-    
-
-    
-     
-    
-   
[% 'Filter' | $T8 %]

-      
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       
-        
-        
-       
-       [% IF conf_show_best_before %]
-       
-        
-        
-       
-       [% END %]
-       
-        
-        
-       
-      
[% 'Warehouse' | $T8 %]:
-         
-        
[% 'Bin' | $T8 %]:
[% 'Part Number' | $T8 %]:
[% 'Part Description' | $T8 %]:
[% 'Charge Number' | $T8 %]:
[% 'Best Before' | $T8 %]:
-         
-         
-        
[% 'Qty in stock' | $T8 %]:
-         
-         
-         
-        

-     
 
[% 'Include in Report' | $T8 %]

-      
-      
-
-      
-       
-        
-        
-        
-        
-       
-
-       
-        
-        
-        
-        
-        [% IF conf_show_best_before %]
-        
-        
-        [% END %]
-       
-
-       
-
-       
-        
-        
-        
-        
-       
-
-       
-        
-        
-       
-
-      

-     

-  

-
-  

-   
-  

- 

-
- [% IF conf_show_best_before %]
- 
- [% END %]
-
-
-
diff --git a/templates/webpages/wh/transfer_parts_selection.html b/templates/webpages/wh/transfer_parts_selection.html
new file mode 100644
index 000000000..6ef7eda85
--- /dev/null
+++ b/templates/webpages/wh/transfer_parts_selection.html
@@ -0,0 +1,129 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]
+
+ 
+
+ 

+
+  
+  
+
+  
[% title %]

+
+  
[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+   
[% 'Select type of transfer' | $T8 %]:
+      
+     
[% 'Optional comment' | $T8 %]:

+  

+
+  

+   
+    
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+     
+    
+
+    [% FOREACH row = CONTENTS %]
+    
+     
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+     
+     
+     [% IF conf_show_best_before %]
+     
+     [% END %]
+     
+     
+     
+     
+
+     
+     
+    
+
+    [% END %]
+
+    
+
+   
[% 'Source bin' | $T8 %][% 'Part Number' | $T8 %][% 'Part Description' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %][% 'Available qty' | $T8 %][% 'Transfer qty' | $T8 %][% 'Destination warehouse and bin' | $T8 %]
[% HTML.escape(row.bindescription) %][% HTML.escape(row.partnumber) %][% HTML.escape(row.partdescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(row.ean) %][% HTML.escape(row.qty) %]
+      
+     
+      
+     

+  

+
+  

+
+  

+   
+  

+ 

+
+
+
diff --git a/templates/webpages/wh/transfer_parts_selection_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
deleted file mode 100644
index 6ef7eda85..000000000
--- a/templates/webpages/wh/transfer_parts_selection_master.html
+++ /dev/null
@@ -1,129 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %]
-
- 
-
- 

-
-  
-  
-
-  
[% title %]

-
-  
[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-   
[% 'Select type of transfer' | $T8 %]:
-      
-     
[% 'Optional comment' | $T8 %]:

-  

-
-  

-   
-    
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-     
-    
-
-    [% FOREACH row = CONTENTS %]
-    
-     
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-     
-     
-     [% IF conf_show_best_before %]
-     
-     [% END %]
-     
-     
-     
-     
-
-     
-     
-    
-
-    [% END %]
-
-    
-
-   
[% 'Source bin' | $T8 %][% 'Part Number' | $T8 %][% 'Part Description' | $T8 %][% 'Charge Number' | $T8 %][% 'Best Before' | $T8 %][% 'EAN' | $T8 %][% 'Available qty' | $T8 %][% 'Transfer qty' | $T8 %][% 'Destination warehouse and bin' | $T8 %]
[% HTML.escape(row.bindescription) %][% HTML.escape(row.partnumber) %][% HTML.escape(row.partdescription) %][% HTML.escape(row.chargenumber) %][% HTML.escape(row.bestbefore) %][% HTML.escape(row.ean) %][% HTML.escape(row.qty) %]
-      
-     
-      
-     

-  

-
-  

-
-  

-   
-  

- 

-
-
-
diff --git a/templates/webpages/wh/warehouse_selection.html b/templates/webpages/wh/warehouse_selection.html
new file mode 100644
index 000000000..afdc7a4ea
--- /dev/null
+++ b/templates/webpages/wh/warehouse_selection.html
@@ -0,0 +1,157 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[% USE JavaScript %]
+
+ 
+ 
+ 
+
+ 

+
+  
+
+  [% IF saved_message %]
+  
[% saved_message %]

+  [% END %]
+
+  
[% title %]

+
+  

+   [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
+  

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [% IF conf_show_best_before %]
+    
+     
+     
+    
+    [% END %]
+
+    
+     
+     
+    
+   
[% 'Transfer from warehouse' | $T8 %]:
+      
+     
[% 'Bin' | $T8 %]:
[% 'Limit part selection' | $T8 %]:
[% 'Part Number' | $T8 %]
+      
+      
+     
[% 'Part Description' | $T8 %]
+      
+      
+     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
+       
+       
+     
[% 'EAN' | $T8 %]

+  

+
+  

+   
+  

+ 

+
+ [% IF conf_show_best_before %]
+ 
+ [% END %]
+
+
+
diff --git a/templates/webpages/wh/warehouse_selection_assembly.html b/templates/webpages/wh/warehouse_selection_assembly.html
new file mode 100644
index 000000000..74da21aa3
--- /dev/null
+++ b/templates/webpages/wh/warehouse_selection_assembly.html
@@ -0,0 +1,159 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %][% USE LxERP %]
+
+ 
+ 
+ 
+
+ 

+
+  
+  
+
+  [% IF saved_message %]
+  
[% saved_message %]

+  [% END %]
+
+  
[% title %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [% IF conf_show_best_before %]
+    
+     
+     
+    
+    [% END %]
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+   
[% 'Destination warehouse' | $T8 %]
+      
+     
[% 'Destination bin' | $T8 %]:
[% 'Assembly Number' | $T8 %]
+      
+      
+      
+     
[% 'Assembly Description' | $T8 %]
+      
+      
+     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
+       
+       
+     
[% 'Quantity' | $T8 %]
+      
+      
+     
[% 'Optional comment' | $T8 %]

+  

+
+  

+   
+   [%- IF parts_id %]
+   
+   [%- END %]
+  

+ 

+
+ [% IF conf_show_best_before %]
+ 
+ [% END %]
+
+
+
diff --git a/templates/webpages/wh/warehouse_selection_assembly_master.html b/templates/webpages/wh/warehouse_selection_assembly_master.html
deleted file mode 100644
index 74da21aa3..000000000
--- a/templates/webpages/wh/warehouse_selection_assembly_master.html
+++ /dev/null
@@ -1,159 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]
-
- 
- 
- 
-
- 

-
-  
-  
-
-  [% IF saved_message %]
-  
[% saved_message %]

-  [% END %]
-
-  
[% title %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [% IF conf_show_best_before %]
-    
-     
-     
-    
-    [% END %]
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-   
[% 'Destination warehouse' | $T8 %]
-      
-     
[% 'Destination bin' | $T8 %]:
[% 'Assembly Number' | $T8 %]
-      
-      
-      
-     
[% 'Assembly Description' | $T8 %]
-      
-      
-     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
-       
-       
-     
[% 'Quantity' | $T8 %]
-      
-      
-     
[% 'Optional comment' | $T8 %]

-  

-
-  

-   
-   [%- IF parts_id %]
-   
-   [%- END %]
-  

- 

-
- [% IF conf_show_best_before %]
- 
- [% END %]
-
-
-
diff --git a/templates/webpages/wh/warehouse_selection_master.html b/templates/webpages/wh/warehouse_selection_master.html
deleted file mode 100644
index afdc7a4ea..000000000
--- a/templates/webpages/wh/warehouse_selection_master.html
+++ /dev/null
@@ -1,157 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[% USE JavaScript %]
-
- 
- 
- 
-
- 

-
-  
-
-  [% IF saved_message %]
-  
[% saved_message %]

-  [% END %]
-
-  
[% title %]

-
-  

-   [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
-  

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [% IF conf_show_best_before %]
-    
-     
-     
-    
-    [% END %]
-
-    
-     
-     
-    
-   
[% 'Transfer from warehouse' | $T8 %]:
-      
-     
[% 'Bin' | $T8 %]:
[% 'Limit part selection' | $T8 %]:
[% 'Part Number' | $T8 %]
-      
-      
-     
[% 'Part Description' | $T8 %]
-      
-      
-     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
-       
-       
-     
[% 'EAN' | $T8 %]

-  

-
-  

-   
-  

- 

-
- [% IF conf_show_best_before %]
- 
- [% END %]
-
-
-
diff --git a/templates/webpages/wh/warehouse_selection_stock.html b/templates/webpages/wh/warehouse_selection_stock.html
new file mode 100644
index 000000000..ca164a53b
--- /dev/null
+++ b/templates/webpages/wh/warehouse_selection_stock.html
@@ -0,0 +1,164 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %][% USE LxERP %]
+
+ 
+ 
+ 
+
+ 

+
+  
+  
+
+  [% IF saved_message %]
+  
[% saved_message %]

+  [% END %]
+
+  
[% title %]

+
+  

+   
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    [% IF conf_show_best_before %]
+    
+     
+     
+    
+    [% END %]
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+    
+     
+     
+    
+
+   
[% 'Destination warehouse' | $T8 %]
+      
+     
[% 'Destination bin' | $T8 %]:
[% 'Part Number' | $T8 %]
+      
+      
+      
+     
[% 'Part Description' | $T8 %]
+      
+      
+     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
+       
+       
+     
[% 'EAN' | $T8 %]
[% 'Quantity' | $T8 %]
+      
+      
+     
[% 'Optional comment' | $T8 %]

+  

+
+  

+   
+   [%- IF parts_id %]
+   
+   [%- END %]
+  

+ 

+
+ [% IF conf_show_best_before %]
+ 
+  [% END %]
+
+
+
diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
deleted file mode 100644
index ca164a53b..000000000
--- a/templates/webpages/wh/warehouse_selection_stock_master.html
+++ /dev/null
@@ -1,164 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]
-
- 
- 
- 
-
- 

-
-  
-  
-
-  [% IF saved_message %]
-  
[% saved_message %]

-  [% END %]
-
-  
[% title %]

-
-  

-   
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    [% IF conf_show_best_before %]
-    
-     
-     
-    
-    [% END %]
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-    
-     
-     
-    
-
-   
[% 'Destination warehouse' | $T8 %]
-      
-     
[% 'Destination bin' | $T8 %]:
[% 'Part Number' | $T8 %]
-      
-      
-      
-     
[% 'Part Description' | $T8 %]
-      
-      
-     
[% 'Charge number' | $T8 %]
[% 'Best Before' | $T8 %]
-       
-       
-     
[% 'EAN' | $T8 %]
[% 'Quantity' | $T8 %]
-      
-      
-     
[% 'Optional comment' | $T8 %]

-  

-
-  

-   
-   [%- IF parts_id %]
-   
-   [%- END %]
-  

- 

-
- [% IF conf_show_best_before %]
- 
-  [% END %]
-
-
-