]> wagnertech.de Git - mfinanz.git/commitdiff
Merge branch 'template_locales'
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 14:13:05 +0000 (16:13 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 14:13:05 +0000 (16:13 +0200)
Conflicts:
templates/webpages/admin/edit_user_master.html
templates/webpages/admin/list_users_de.html
templates/webpages/is/form_header_master.html

855 files changed:
SL/Form.pm
SL/Template/Plugin/L.pm [new file with mode: 0644]
SL/Template/Plugin/LxERP.pm
SL/Template/Plugin/T8.pm
bin/mozilla/arap.pl
bin/mozilla/common.pl
css/lx-office-erp.css
locale/de/all
locale/de/ap
locale/de/ar
locale/de/arap
locale/de/cp
locale/de/do
locale/de/io
locale/de/ir
locale/de/is
locale/de/locales.pl
locale/de/login
locale/de/oe
locale/de/rp
locale/de/todo
scripts/migrate_template_to_t8.pl [new file with mode: 0755]
t/004template.t
templates/webpages/acctranscorrections/analyze_filter.html [new file with mode: 0644]
templates/webpages/acctranscorrections/analyze_filter_de.html [deleted file]
templates/webpages/acctranscorrections/analyze_filter_en.html [deleted file]
templates/webpages/acctranscorrections/analyze_filter_master.html [deleted file]
templates/webpages/acctranscorrections/analyze_overview.html [new file with mode: 0644]
templates/webpages/acctranscorrections/analyze_overview_de.html [deleted file]
templates/webpages/acctranscorrections/analyze_overview_en.html [deleted file]
templates/webpages/acctranscorrections/analyze_overview_master.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html [new file with mode: 0644]
templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxes_en.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction.html [new file with mode: 0644]
templates/webpages/acctranscorrections/delete_transaction_confirmation.html [new file with mode: 0644]
templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction_confirmation_en.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction_de.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction_en.html [deleted file]
templates/webpages/acctranscorrections/delete_transaction_master.html [deleted file]
templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html [deleted file]
templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html [deleted file]
templates/webpages/acctranscorrections/fix_wrong_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html [deleted file]
templates/webpages/acctranscorrections/fix_wrong_taxkeys_en.html [deleted file]
templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html [deleted file]
templates/webpages/admin/adminlogin.html [new file with mode: 0644]
templates/webpages/admin/adminlogin_de.html [deleted file]
templates/webpages/admin/adminlogin_en.html [deleted file]
templates/webpages/admin/adminlogin_master.html [deleted file]
templates/webpages/admin/backup_dataset.html [new file with mode: 0644]
templates/webpages/admin/backup_dataset_de.html [deleted file]
templates/webpages/admin/backup_dataset_email_done.html [new file with mode: 0644]
templates/webpages/admin/backup_dataset_email_done_de.html [deleted file]
templates/webpages/admin/backup_dataset_email_done_en.html [deleted file]
templates/webpages/admin/backup_dataset_email_done_master.html [deleted file]
templates/webpages/admin/backup_dataset_en.html [deleted file]
templates/webpages/admin/backup_dataset_master.html [deleted file]
templates/webpages/admin/check_auth_database.html [new file with mode: 0644]
templates/webpages/admin/check_auth_database_de.html [deleted file]
templates/webpages/admin/check_auth_database_en.html [deleted file]
templates/webpages/admin/check_auth_database_master.html [deleted file]
templates/webpages/admin/check_auth_tables.html [new file with mode: 0644]
templates/webpages/admin/check_auth_tables_de.html [deleted file]
templates/webpages/admin/check_auth_tables_en.html [deleted file]
templates/webpages/admin/check_auth_tables_master.html [deleted file]
templates/webpages/admin/create_dataset.html [new file with mode: 0644]
templates/webpages/admin/create_dataset_de.html [deleted file]
templates/webpages/admin/create_dataset_en.html [deleted file]
templates/webpages/admin/create_dataset_master.html [deleted file]
templates/webpages/admin/create_standard_group_ask.html [new file with mode: 0644]
templates/webpages/admin/create_standard_group_ask_de.html [deleted file]
templates/webpages/admin/create_standard_group_ask_en.html [deleted file]
templates/webpages/admin/create_standard_group_ask_master.html [deleted file]
templates/webpages/admin/dbadmin.html [new file with mode: 0644]
templates/webpages/admin/dbadmin_de.html [deleted file]
templates/webpages/admin/dbadmin_en.html [deleted file]
templates/webpages/admin/dbadmin_master.html [deleted file]
templates/webpages/admin/dbcreate.html [new file with mode: 0644]
templates/webpages/admin/dbcreate_de.html [deleted file]
templates/webpages/admin/dbcreate_en.html [deleted file]
templates/webpages/admin/dbcreate_master.html [deleted file]
templates/webpages/admin/dbdelete.html [new file with mode: 0644]
templates/webpages/admin/dbdelete_de.html [deleted file]
templates/webpages/admin/dbdelete_en.html [deleted file]
templates/webpages/admin/dbdelete_master.html [deleted file]
templates/webpages/admin/dbupgrade_all_done.html [new file with mode: 0644]
templates/webpages/admin/dbupgrade_all_done_de.html [deleted file]
templates/webpages/admin/dbupgrade_all_done_en.html [deleted file]
templates/webpages/admin/dbupgrade_all_done_master.html [deleted file]
templates/webpages/admin/dbupgrade_all_header.html [new file with mode: 0644]
templates/webpages/admin/dbupgrade_all_header_de.html [deleted file]
templates/webpages/admin/dbupgrade_all_header_en.html [deleted file]
templates/webpages/admin/dbupgrade_all_header_master.html [deleted file]
templates/webpages/admin/dbupgrade_footer.html [new file with mode: 0644]
templates/webpages/admin/dbupgrade_footer_de.html [deleted file]
templates/webpages/admin/dbupgrade_footer_en.html [deleted file]
templates/webpages/admin/dbupgrade_footer_master.html [deleted file]
templates/webpages/admin/dbupgrade_header.html [new file with mode: 0644]
templates/webpages/admin/dbupgrade_header_de.html [deleted file]
templates/webpages/admin/dbupgrade_header_en.html [deleted file]
templates/webpages/admin/dbupgrade_header_master.html [deleted file]
templates/webpages/admin/delete_dataset.html [new file with mode: 0644]
templates/webpages/admin/delete_dataset_de.html [deleted file]
templates/webpages/admin/delete_dataset_en.html [deleted file]
templates/webpages/admin/delete_dataset_master.html [deleted file]
templates/webpages/admin/delete_group_confirm.html [new file with mode: 0644]
templates/webpages/admin/delete_group_confirm_de.html [deleted file]
templates/webpages/admin/delete_group_confirm_en.html [deleted file]
templates/webpages/admin/delete_group_confirm_master.html [deleted file]
templates/webpages/admin/edit_group.html [new file with mode: 0644]
templates/webpages/admin/edit_group_de.html [deleted file]
templates/webpages/admin/edit_group_en.html [deleted file]
templates/webpages/admin/edit_group_master.html [deleted file]
templates/webpages/admin/edit_group_membership.html [new file with mode: 0644]
templates/webpages/admin/edit_group_membership_de.html [deleted file]
templates/webpages/admin/edit_group_membership_en.html [deleted file]
templates/webpages/admin/edit_group_membership_master.html [deleted file]
templates/webpages/admin/edit_groups.html [new file with mode: 0644]
templates/webpages/admin/edit_groups_de.html [deleted file]
templates/webpages/admin/edit_groups_en.html [deleted file]
templates/webpages/admin/edit_groups_master.html [deleted file]
templates/webpages/admin/edit_user.html [new file with mode: 0644]
templates/webpages/admin/edit_user_de.html [deleted file]
templates/webpages/admin/edit_user_en.html [deleted file]
templates/webpages/admin/edit_user_master.html [deleted file]
templates/webpages/admin/list_users.html [new file with mode: 0644]
templates/webpages/admin/list_users_de.html [deleted file]
templates/webpages/admin/list_users_en.html [deleted file]
templates/webpages/admin/list_users_master.html [deleted file]
templates/webpages/admin/restore_dataset.html [new file with mode: 0644]
templates/webpages/admin/restore_dataset_de.html [deleted file]
templates/webpages/admin/restore_dataset_en.html [deleted file]
templates/webpages/admin/restore_dataset_master.html [deleted file]
templates/webpages/admin/restore_dataset_start_footer.html [new file with mode: 0644]
templates/webpages/admin/restore_dataset_start_footer_de.html [deleted file]
templates/webpages/admin/restore_dataset_start_footer_en.html [deleted file]
templates/webpages/admin/restore_dataset_start_footer_master.html [deleted file]
templates/webpages/admin/restore_dataset_start_header.html [new file with mode: 0644]
templates/webpages/admin/restore_dataset_start_header_de.html [deleted file]
templates/webpages/admin/restore_dataset_start_header_en.html [deleted file]
templates/webpages/admin/restore_dataset_start_header_master.html [deleted file]
templates/webpages/admin/test_db_connection.html [new file with mode: 0644]
templates/webpages/admin/test_db_connection_de.html [deleted file]
templates/webpages/admin/test_db_connection_en.html [deleted file]
templates/webpages/admin/test_db_connection_master.html [deleted file]
templates/webpages/admin/update_dataset.html [new file with mode: 0644]
templates/webpages/admin/update_dataset_de.html [deleted file]
templates/webpages/admin/update_dataset_en.html [deleted file]
templates/webpages/admin/update_dataset_master.html [deleted file]
templates/webpages/admin/user_migration.html [new file with mode: 0644]
templates/webpages/admin/user_migration_complete.html [new file with mode: 0644]
templates/webpages/admin/user_migration_complete_de.html [deleted file]
templates/webpages/admin/user_migration_complete_en.html [deleted file]
templates/webpages/admin/user_migration_complete_master.html [deleted file]
templates/webpages/admin/user_migration_de.html [deleted file]
templates/webpages/admin/user_migration_done.html [new file with mode: 0644]
templates/webpages/admin/user_migration_done_de.html [deleted file]
templates/webpages/admin/user_migration_done_en.html [deleted file]
templates/webpages/admin/user_migration_done_master.html [deleted file]
templates/webpages/admin/user_migration_en.html [deleted file]
templates/webpages/admin/user_migration_master.html [deleted file]
templates/webpages/am/config.html [new file with mode: 0644]
templates/webpages/am/config_de.html [deleted file]
templates/webpages/am/config_en.html [deleted file]
templates/webpages/am/config_master.html [deleted file]
templates/webpages/am/confirm_delete_warehouse.html [new file with mode: 0644]
templates/webpages/am/confirm_delete_warehouse_de.html [deleted file]
templates/webpages/am/confirm_delete_warehouse_en.html [deleted file]
templates/webpages/am/confirm_delete_warehouse_master.html [deleted file]
templates/webpages/am/edit_accounts.html [new file with mode: 0644]
templates/webpages/am/edit_accounts_de.html [deleted file]
templates/webpages/am/edit_accounts_en.html [deleted file]
templates/webpages/am/edit_accounts_master.html [deleted file]
templates/webpages/am/edit_defaults.html [new file with mode: 0644]
templates/webpages/am/edit_defaults_de.html [deleted file]
templates/webpages/am/edit_defaults_en.html [deleted file]
templates/webpages/am/edit_defaults_master.html [deleted file]
templates/webpages/am/edit_price_factor.html [new file with mode: 0644]
templates/webpages/am/edit_price_factor_de.html [deleted file]
templates/webpages/am/edit_price_factor_en.html [deleted file]
templates/webpages/am/edit_price_factor_master.html [deleted file]
templates/webpages/am/edit_tax.html [new file with mode: 0644]
templates/webpages/am/edit_tax_de.html [deleted file]
templates/webpages/am/edit_tax_en.html [deleted file]
templates/webpages/am/edit_tax_master.html [deleted file]
templates/webpages/am/edit_templates.html [new file with mode: 0644]
templates/webpages/am/edit_templates_de.html [deleted file]
templates/webpages/am/edit_templates_en.html [deleted file]
templates/webpages/am/edit_templates_master.html [deleted file]
templates/webpages/am/edit_units.html [new file with mode: 0644]
templates/webpages/am/edit_units_de.html [deleted file]
templates/webpages/am/edit_units_en.html [deleted file]
templates/webpages/am/edit_units_master.html [deleted file]
templates/webpages/am/edit_warehouse.html [new file with mode: 0644]
templates/webpages/am/edit_warehouse_de.html [deleted file]
templates/webpages/am/edit_warehouse_en.html [deleted file]
templates/webpages/am/edit_warehouse_master.html [deleted file]
templates/webpages/am/list_account_details.html [new file with mode: 0644]
templates/webpages/am/list_account_details_de.html [deleted file]
templates/webpages/am/list_account_details_en.html [deleted file]
templates/webpages/am/list_account_details_master.html [deleted file]
templates/webpages/am/list_accounts.html [new file with mode: 0644]
templates/webpages/am/list_accounts_de.html [deleted file]
templates/webpages/am/list_accounts_en.html [deleted file]
templates/webpages/am/list_accounts_master.html [deleted file]
templates/webpages/am/list_price_factors.html [new file with mode: 0644]
templates/webpages/am/list_price_factors_de.html [deleted file]
templates/webpages/am/list_price_factors_en.html [deleted file]
templates/webpages/am/list_price_factors_master.html [deleted file]
templates/webpages/am/list_tax.html [new file with mode: 0644]
templates/webpages/am/list_tax_de.html [deleted file]
templates/webpages/am/list_tax_en.html [deleted file]
templates/webpages/am/list_tax_master.html [deleted file]
templates/webpages/am/list_warehouses.html [new file with mode: 0644]
templates/webpages/am/list_warehouses_de.html [deleted file]
templates/webpages/am/list_warehouses_en.html [deleted file]
templates/webpages/am/list_warehouses_master.html [deleted file]
templates/webpages/amcvar/display_cvar_config_form.html [new file with mode: 0644]
templates/webpages/amcvar/display_cvar_config_form_de.html [deleted file]
templates/webpages/amcvar/display_cvar_config_form_en.html [deleted file]
templates/webpages/amcvar/display_cvar_config_form_master.html [deleted file]
templates/webpages/amcvar/list_cvar_configs.html [new file with mode: 0644]
templates/webpages/amcvar/list_cvar_configs_de.html [deleted file]
templates/webpages/amcvar/list_cvar_configs_en.html [deleted file]
templates/webpages/amcvar/list_cvar_configs_master.html [deleted file]
templates/webpages/amcvar/render_checkboxes.html [new file with mode: 0644]
templates/webpages/amcvar/render_checkboxes_de.html [deleted file]
templates/webpages/amcvar/render_checkboxes_en.html [deleted file]
templates/webpages/amcvar/render_checkboxes_master.html [deleted file]
templates/webpages/amcvar/render_inputs.html [new file with mode: 0644]
templates/webpages/amcvar/render_inputs_de.html [deleted file]
templates/webpages/amcvar/render_inputs_en.html [deleted file]
templates/webpages/amcvar/render_inputs_master.html [deleted file]
templates/webpages/amcvar/search_filter.html [new file with mode: 0644]
templates/webpages/amcvar/search_filter_de.html [deleted file]
templates/webpages/amcvar/search_filter_en.html [deleted file]
templates/webpages/amcvar/search_filter_master.html [deleted file]
templates/webpages/amcvar/search_include.html [new file with mode: 0644]
templates/webpages/amcvar/search_include_de.html [deleted file]
templates/webpages/amcvar/search_include_en.html [deleted file]
templates/webpages/amcvar/search_include_master.html [deleted file]
templates/webpages/ap/ap_transactions_bottom.html [new file with mode: 0644]
templates/webpages/ap/ap_transactions_bottom_de.html [deleted file]
templates/webpages/ap/ap_transactions_bottom_en.html [deleted file]
templates/webpages/ap/ap_transactions_bottom_master.html [deleted file]
templates/webpages/ap/search.html [new file with mode: 0644]
templates/webpages/ap/search_de.html [deleted file]
templates/webpages/ap/search_en.html [deleted file]
templates/webpages/ap/search_master.html [deleted file]
templates/webpages/ar/ar_transactions_bottom.html [new file with mode: 0644]
templates/webpages/ar/ar_transactions_bottom_de.html [deleted file]
templates/webpages/ar/ar_transactions_bottom_en.html [deleted file]
templates/webpages/ar/ar_transactions_bottom_master.html [deleted file]
templates/webpages/ar/search.html [new file with mode: 0644]
templates/webpages/ar/search_de.html [deleted file]
templates/webpages/ar/search_en.html [deleted file]
templates/webpages/ar/search_master.html [deleted file]
templates/webpages/bankaccounts/bank_account_display_form.html [new file with mode: 0644]
templates/webpages/bankaccounts/bank_account_display_form_de.html [deleted file]
templates/webpages/bankaccounts/bank_account_display_form_en.html [deleted file]
templates/webpages/bankaccounts/bank_account_display_form_master.html [deleted file]
templates/webpages/bankaccounts/bank_account_list_bottom.html [new file with mode: 0644]
templates/webpages/bankaccounts/bank_account_list_bottom_de.html [deleted file]
templates/webpages/bankaccounts/bank_account_list_bottom_en.html [deleted file]
templates/webpages/bankaccounts/bank_account_list_bottom_master.html [deleted file]
templates/webpages/common/search_history.html [new file with mode: 0644]
templates/webpages/common/search_history_de.html [deleted file]
templates/webpages/common/search_history_en.html [deleted file]
templates/webpages/common/search_history_master.html [deleted file]
templates/webpages/common/show_history.html [new file with mode: 0644]
templates/webpages/common/show_history_de.html [deleted file]
templates/webpages/common/show_history_en.html [deleted file]
templates/webpages/common/show_history_master.html [deleted file]
templates/webpages/common/show_vc_details.html [new file with mode: 0644]
templates/webpages/common/show_vc_details_de.html [deleted file]
templates/webpages/common/show_vc_details_en.html [deleted file]
templates/webpages/common/show_vc_details_master.html [deleted file]
templates/webpages/ct/ajax_autocomplete.html [new file with mode: 0644]
templates/webpages/ct/ajax_autocomplete_de.html [deleted file]
templates/webpages/ct/ajax_autocomplete_en.html [deleted file]
templates/webpages/ct/ajax_autocomplete_master.html [deleted file]
templates/webpages/ct/form_footer.html [new file with mode: 0644]
templates/webpages/ct/form_footer_de.html [deleted file]
templates/webpages/ct/form_footer_en.html [deleted file]
templates/webpages/ct/form_footer_master.html [deleted file]
templates/webpages/ct/form_header.html [new file with mode: 0644]
templates/webpages/ct/form_header_de.html [deleted file]
templates/webpages/ct/form_header_en.html [deleted file]
templates/webpages/ct/form_header_master.html [deleted file]
templates/webpages/ct/get_delivery.html [new file with mode: 0644]
templates/webpages/ct/get_delivery_de.html [deleted file]
templates/webpages/ct/get_delivery_en.html [deleted file]
templates/webpages/ct/get_delivery_master.html [deleted file]
templates/webpages/ct/list_names_bottom.html [new file with mode: 0644]
templates/webpages/ct/list_names_bottom_de.html [deleted file]
templates/webpages/ct/list_names_bottom_en.html [deleted file]
templates/webpages/ct/list_names_bottom_master.html [deleted file]
templates/webpages/ct/search.html [new file with mode: 0644]
templates/webpages/ct/search_de.html [deleted file]
templates/webpages/ct/search_en.html [deleted file]
templates/webpages/ct/search_master.html [deleted file]
templates/webpages/datev/net_gross_difference.html [new file with mode: 0644]
templates/webpages/datev/net_gross_difference_de.html [deleted file]
templates/webpages/datev/net_gross_difference_en.html [deleted file]
templates/webpages/datev/net_gross_difference_master.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_already_exists.html [new file with mode: 0644]
templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_update.html [new file with mode: 0644]
templates/webpages/dbupgrade/SKR04_3804_update_de.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_update_en.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_update_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_footer.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_footer_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_footer_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_footer_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_header.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_header_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_header_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_header_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_parts_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts_done_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_parts_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_services_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services_done_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services_en.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_services_master.html [deleted file]
templates/webpages/dbupgrade/coa_guess.html [new file with mode: 0644]
templates/webpages/dbupgrade/coa_guess_de.html [deleted file]
templates/webpages/dbupgrade/coa_guess_en.html [deleted file]
templates/webpages/dbupgrade/coa_guess_master.html [deleted file]
templates/webpages/dbupgrade/cp_greeting_update_form.html [new file with mode: 0644]
templates/webpages/dbupgrade/cp_greeting_update_form_de.html [deleted file]
templates/webpages/dbupgrade/cp_greeting_update_form_en.html [deleted file]
templates/webpages/dbupgrade/cp_greeting_update_form_master.html [deleted file]
templates/webpages/dbupgrade/error.html [new file with mode: 0644]
templates/webpages/dbupgrade/error_de.html [deleted file]
templates/webpages/dbupgrade/error_en.html [deleted file]
templates/webpages/dbupgrade/error_master.html [deleted file]
templates/webpages/dbupgrade/footer.html [new file with mode: 0644]
templates/webpages/dbupgrade/footer_de.html [deleted file]
templates/webpages/dbupgrade/footer_en.html [deleted file]
templates/webpages/dbupgrade/footer_master.html [deleted file]
templates/webpages/dbupgrade/header.html [new file with mode: 0644]
templates/webpages/dbupgrade/header_de.html [deleted file]
templates/webpages/dbupgrade/header_en.html [deleted file]
templates/webpages/dbupgrade/header_master.html [deleted file]
templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html [new file with mode: 0644]
templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html [deleted file]
templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_en.html [deleted file]
templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html [deleted file]
templates/webpages/dbupgrade/units_error.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_error_de.html [deleted file]
templates/webpages/dbupgrade/units_error_en.html [deleted file]
templates/webpages/dbupgrade/units_error_master.html [deleted file]
templates/webpages/dbupgrade/units_header.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_header_de.html [deleted file]
templates/webpages/dbupgrade/units_header_en.html [deleted file]
templates/webpages/dbupgrade/units_header_master.html [deleted file]
templates/webpages/dbupgrade/units_parts.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_parts_de.html [deleted file]
templates/webpages/dbupgrade/units_parts_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_parts_done_de.html [deleted file]
templates/webpages/dbupgrade/units_parts_done_en.html [deleted file]
templates/webpages/dbupgrade/units_parts_done_master.html [deleted file]
templates/webpages/dbupgrade/units_parts_en.html [deleted file]
templates/webpages/dbupgrade/units_parts_master.html [deleted file]
templates/webpages/dbupgrade/units_services.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_services_de.html [deleted file]
templates/webpages/dbupgrade/units_services_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_services_done_de.html [deleted file]
templates/webpages/dbupgrade/units_services_done_en.html [deleted file]
templates/webpages/dbupgrade/units_services_done_master.html [deleted file]
templates/webpages/dbupgrade/units_services_en.html [deleted file]
templates/webpages/dbupgrade/units_services_master.html [deleted file]
templates/webpages/dbupgrade/units_set_default.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_set_default_de.html [deleted file]
templates/webpages/dbupgrade/units_set_default_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_set_default_done_de.html [deleted file]
templates/webpages/dbupgrade/units_set_default_done_en.html [deleted file]
templates/webpages/dbupgrade/units_set_default_done_master.html [deleted file]
templates/webpages/dbupgrade/units_set_default_en.html [deleted file]
templates/webpages/dbupgrade/units_set_default_master.html [deleted file]
templates/webpages/dbupgrade/update_templates_warnings.html [new file with mode: 0644]
templates/webpages/dbupgrade/update_templates_warnings_de.html [deleted file]
templates/webpages/dbupgrade/update_templates_warnings_en.html [deleted file]
templates/webpages/dbupgrade/update_templates_warnings_master.html [deleted file]
templates/webpages/dbupgrade/upgrade_message2.html [new file with mode: 0644]
templates/webpages/dbupgrade/upgrade_message2_de.html [deleted file]
templates/webpages/dbupgrade/upgrade_message2_en.html [deleted file]
templates/webpages/dbupgrade/upgrade_message2_master.html [deleted file]
templates/webpages/dbupgrade/warehouse_form.html [new file with mode: 0644]
templates/webpages/dbupgrade/warehouse_form_de.html [deleted file]
templates/webpages/dbupgrade/warehouse_form_en.html [deleted file]
templates/webpages/dbupgrade/warehouse_form_master.html [deleted file]
templates/webpages/dbupgrade/warning.html [new file with mode: 0644]
templates/webpages/dbupgrade/warning_de.html [deleted file]
templates/webpages/dbupgrade/warning_en.html [deleted file]
templates/webpages/dbupgrade/warning_master.html [deleted file]
templates/webpages/do/delete.html [new file with mode: 0644]
templates/webpages/do/delete_de.html [deleted file]
templates/webpages/do/delete_en.html [deleted file]
templates/webpages/do/delete_master.html [deleted file]
templates/webpages/do/form_footer.html [new file with mode: 0644]
templates/webpages/do/form_footer_de.html [deleted file]
templates/webpages/do/form_footer_en.html [deleted file]
templates/webpages/do/form_footer_master.html [deleted file]
templates/webpages/do/form_header.html [new file with mode: 0644]
templates/webpages/do/form_header_de.html [deleted file]
templates/webpages/do/form_header_en.html [deleted file]
templates/webpages/do/form_header_master.html [deleted file]
templates/webpages/do/orders_bottom.html [new file with mode: 0644]
templates/webpages/do/orders_bottom_de.html [deleted file]
templates/webpages/do/orders_bottom_en.html [deleted file]
templates/webpages/do/orders_bottom_master.html [deleted file]
templates/webpages/do/orders_top.html [new file with mode: 0644]
templates/webpages/do/orders_top_de.html [deleted file]
templates/webpages/do/orders_top_en.html [deleted file]
templates/webpages/do/orders_top_master.html [deleted file]
templates/webpages/do/search.html [new file with mode: 0644]
templates/webpages/do/search_de.html [deleted file]
templates/webpages/do/search_en.html [deleted file]
templates/webpages/do/search_master.html [deleted file]
templates/webpages/do/set_stock_in_out.html [new file with mode: 0644]
templates/webpages/do/set_stock_in_out_de.html [deleted file]
templates/webpages/do/set_stock_in_out_en.html [deleted file]
templates/webpages/do/set_stock_in_out_master.html [deleted file]
templates/webpages/do/stock_in_form.html [new file with mode: 0644]
templates/webpages/do/stock_in_form_de.html [deleted file]
templates/webpages/do/stock_in_form_en.html [deleted file]
templates/webpages/do/stock_in_form_master.html [deleted file]
templates/webpages/do/stock_out_form.html [new file with mode: 0644]
templates/webpages/do/stock_out_form_de.html [deleted file]
templates/webpages/do/stock_out_form_en.html [deleted file]
templates/webpages/do/stock_out_form_master.html [deleted file]
templates/webpages/drafts/load.html [new file with mode: 0644]
templates/webpages/drafts/load_de.html [deleted file]
templates/webpages/drafts/load_en.html [deleted file]
templates/webpages/drafts/load_master.html [deleted file]
templates/webpages/drafts/save_new.html [new file with mode: 0644]
templates/webpages/drafts/save_new_de.html [deleted file]
templates/webpages/drafts/save_new_en.html [deleted file]
templates/webpages/drafts/save_new_master.html [deleted file]
templates/webpages/dunning/add.html [new file with mode: 0644]
templates/webpages/dunning/add_de.html [deleted file]
templates/webpages/dunning/add_en.html [deleted file]
templates/webpages/dunning/add_master.html [deleted file]
templates/webpages/dunning/edit_config.html [new file with mode: 0644]
templates/webpages/dunning/edit_config_de.html [deleted file]
templates/webpages/dunning/edit_config_en.html [deleted file]
templates/webpages/dunning/edit_config_master.html [deleted file]
templates/webpages/dunning/search.html [new file with mode: 0644]
templates/webpages/dunning/search_de.html [deleted file]
templates/webpages/dunning/search_en.html [deleted file]
templates/webpages/dunning/search_master.html [deleted file]
templates/webpages/dunning/set_email.html [new file with mode: 0644]
templates/webpages/dunning/set_email_de.html [deleted file]
templates/webpages/dunning/set_email_en.html [deleted file]
templates/webpages/dunning/set_email_master.html [deleted file]
templates/webpages/dunning/show_dunning_bottom.html [new file with mode: 0644]
templates/webpages/dunning/show_dunning_bottom_de.html [deleted file]
templates/webpages/dunning/show_dunning_bottom_en.html [deleted file]
templates/webpages/dunning/show_dunning_bottom_master.html [deleted file]
templates/webpages/dunning/show_dunning_top.html [new file with mode: 0644]
templates/webpages/dunning/show_dunning_top_de.html [deleted file]
templates/webpages/dunning/show_dunning_top_en.html [deleted file]
templates/webpages/dunning/show_dunning_top_master.html [deleted file]
templates/webpages/dunning/show_invoices.html [new file with mode: 0644]
templates/webpages/dunning/show_invoices_de.html [deleted file]
templates/webpages/dunning/show_invoices_en.html [deleted file]
templates/webpages/dunning/show_invoices_master.html [deleted file]
templates/webpages/fu/add_edit.html [new file with mode: 0644]
templates/webpages/fu/add_edit_de.html [deleted file]
templates/webpages/fu/add_edit_en.html [deleted file]
templates/webpages/fu/add_edit_master.html [deleted file]
templates/webpages/fu/close_window.html [new file with mode: 0644]
templates/webpages/fu/close_window_de.html [deleted file]
templates/webpages/fu/close_window_en.html [deleted file]
templates/webpages/fu/close_window_master.html [deleted file]
templates/webpages/fu/edit_access_rights.html [new file with mode: 0644]
templates/webpages/fu/edit_access_rights_de.html [deleted file]
templates/webpages/fu/edit_access_rights_en.html [deleted file]
templates/webpages/fu/edit_access_rights_master.html [deleted file]
templates/webpages/fu/report_bottom.html [new file with mode: 0644]
templates/webpages/fu/report_bottom_de.html [deleted file]
templates/webpages/fu/report_bottom_en.html [deleted file]
templates/webpages/fu/report_bottom_master.html [deleted file]
templates/webpages/fu/report_for_todo_list.html [new file with mode: 0644]
templates/webpages/fu/report_for_todo_list_de.html [deleted file]
templates/webpages/fu/report_for_todo_list_en.html [deleted file]
templates/webpages/fu/report_for_todo_list_master.html [deleted file]
templates/webpages/fu/report_top.html [new file with mode: 0644]
templates/webpages/fu/report_top_de.html [deleted file]
templates/webpages/fu/report_top_en.html [deleted file]
templates/webpages/fu/report_top_master.html [deleted file]
templates/webpages/fu/search.html [new file with mode: 0644]
templates/webpages/fu/search_de.html [deleted file]
templates/webpages/fu/search_en.html [deleted file]
templates/webpages/fu/search_master.html [deleted file]
templates/webpages/generic/calculate_qty.html [new file with mode: 0644]
templates/webpages/generic/calculate_qty_de.html [deleted file]
templates/webpages/generic/calculate_qty_en.html [deleted file]
templates/webpages/generic/calculate_qty_master.html [deleted file]
templates/webpages/generic/cov_selection.html [new file with mode: 0644]
templates/webpages/generic/cov_selection_de.html [deleted file]
templates/webpages/generic/cov_selection_en.html [deleted file]
templates/webpages/generic/cov_selection_master.html [deleted file]
templates/webpages/generic/edit_email.html [new file with mode: 0644]
templates/webpages/generic/edit_email_de.html [deleted file]
templates/webpages/generic/edit_email_en.html [deleted file]
templates/webpages/generic/edit_email_master.html [deleted file]
templates/webpages/generic/error.html [new file with mode: 0644]
templates/webpages/generic/error_de.html [deleted file]
templates/webpages/generic/error_en.html [deleted file]
templates/webpages/generic/error_master.html [deleted file]
templates/webpages/generic/information.html [new file with mode: 0644]
templates/webpages/generic/information_de.html [deleted file]
templates/webpages/generic/information_en.html [deleted file]
templates/webpages/generic/information_master.html [deleted file]
templates/webpages/generic/new_item.html [new file with mode: 0644]
templates/webpages/generic/new_item_de.html [deleted file]
templates/webpages/generic/new_item_en.html [deleted file]
templates/webpages/generic/new_item_master.html [deleted file]
templates/webpages/generic/part_selection.html [new file with mode: 0644]
templates/webpages/generic/part_selection_de.html [deleted file]
templates/webpages/generic/part_selection_en.html [deleted file]
templates/webpages/generic/part_selection_master.html [deleted file]
templates/webpages/generic/print_options.html [new file with mode: 0644]
templates/webpages/generic/print_options_de.html [deleted file]
templates/webpages/generic/print_options_en.html [deleted file]
templates/webpages/generic/print_options_master.html [deleted file]
templates/webpages/generic/select_delivery_customer.html [new file with mode: 0644]
templates/webpages/generic/select_delivery_customer_de.html [deleted file]
templates/webpages/generic/select_delivery_customer_en.html [deleted file]
templates/webpages/generic/select_delivery_customer_master.html [deleted file]
templates/webpages/generic/select_part.html [new file with mode: 0644]
templates/webpages/generic/select_part_de.html [deleted file]
templates/webpages/generic/select_part_en.html [deleted file]
templates/webpages/generic/select_part_master.html [deleted file]
templates/webpages/generic/select_vendor.html [new file with mode: 0644]
templates/webpages/generic/select_vendor_de.html [deleted file]
templates/webpages/generic/select_vendor_en.html [deleted file]
templates/webpages/generic/select_vendor_master.html [deleted file]
templates/webpages/generic/set_longdescription.html [new file with mode: 0644]
templates/webpages/generic/set_longdescription_de.html [deleted file]
templates/webpages/generic/set_longdescription_en.html [deleted file]
templates/webpages/generic/set_longdescription_master.html [deleted file]
templates/webpages/generictranslations/edit_greetings.html [new file with mode: 0644]
templates/webpages/generictranslations/edit_greetings_de.html [deleted file]
templates/webpages/generictranslations/edit_greetings_en.html [deleted file]
templates/webpages/generictranslations/edit_greetings_master.html [deleted file]
templates/webpages/gl/form_header_chart_balances_js.html [new file with mode: 0644]
templates/webpages/gl/form_header_chart_balances_js_de.html [deleted file]
templates/webpages/gl/form_header_chart_balances_js_en.html [deleted file]
templates/webpages/gl/form_header_chart_balances_js_master.html [deleted file]
templates/webpages/gl/generate_report_bottom.html [new file with mode: 0644]
templates/webpages/gl/generate_report_bottom_de.html [deleted file]
templates/webpages/gl/generate_report_bottom_en.html [deleted file]
templates/webpages/gl/generate_report_bottom_master.html [deleted file]
templates/webpages/ic/ajax_autocomplete.html [new file with mode: 0644]
templates/webpages/ic/ajax_autocomplete_de.html [deleted file]
templates/webpages/ic/ajax_autocomplete_en.html [deleted file]
templates/webpages/ic/ajax_autocomplete_master.html [deleted file]
templates/webpages/ic/assembly_row.html [new file with mode: 0644]
templates/webpages/ic/assembly_row_de.html [deleted file]
templates/webpages/ic/assembly_row_en.html [deleted file]
templates/webpages/ic/assembly_row_master.html [deleted file]
templates/webpages/ic/choice.html [new file with mode: 0644]
templates/webpages/ic/choice_de.html [deleted file]
templates/webpages/ic/choice_en.html [deleted file]
templates/webpages/ic/choice_master.html [deleted file]
templates/webpages/ic/confirm_price_update.html [new file with mode: 0644]
templates/webpages/ic/confirm_price_update_de.html [deleted file]
templates/webpages/ic/confirm_price_update_en.html [deleted file]
templates/webpages/ic/confirm_price_update_master.html [deleted file]
templates/webpages/ic/form_footer.html [new file with mode: 0644]
templates/webpages/ic/form_footer_de.html [deleted file]
templates/webpages/ic/form_footer_en.html [deleted file]
templates/webpages/ic/form_footer_master.html [deleted file]
templates/webpages/ic/form_header.html [new file with mode: 0644]
templates/webpages/ic/form_header_de.html [deleted file]
templates/webpages/ic/form_header_en.html [deleted file]
templates/webpages/ic/form_header_master.html [deleted file]
templates/webpages/ic/generate_report_bottom.html [new file with mode: 0644]
templates/webpages/ic/generate_report_bottom_de.html [deleted file]
templates/webpages/ic/generate_report_bottom_en.html [deleted file]
templates/webpages/ic/generate_report_bottom_master.html [deleted file]
templates/webpages/ic/makemodel.html [new file with mode: 0644]
templates/webpages/ic/makemodel_de.html [deleted file]
templates/webpages/ic/makemodel_en.html [deleted file]
templates/webpages/ic/makemodel_master.html [deleted file]
templates/webpages/ic/parts_language_selection.html [new file with mode: 0644]
templates/webpages/ic/parts_language_selection_de.html [deleted file]
templates/webpages/ic/parts_language_selection_en.html [deleted file]
templates/webpages/ic/parts_language_selection_master.html [deleted file]
templates/webpages/ic/price_row.html [new file with mode: 0644]
templates/webpages/ic/price_row_de.html [deleted file]
templates/webpages/ic/price_row_en.html [deleted file]
templates/webpages/ic/price_row_master.html [deleted file]
templates/webpages/ic/search.html [new file with mode: 0644]
templates/webpages/ic/search_de.html [deleted file]
templates/webpages/ic/search_en.html [deleted file]
templates/webpages/ic/search_master.html [deleted file]
templates/webpages/ic/search_update_prices.html [new file with mode: 0644]
templates/webpages/ic/search_update_prices_de.html [deleted file]
templates/webpages/ic/search_update_prices_en.html [deleted file]
templates/webpages/ic/search_update_prices_master.html [deleted file]
templates/webpages/ir/_payments.html [new file with mode: 0644]
templates/webpages/ir/_payments_de.html [deleted file]
templates/webpages/ir/_payments_en.html [deleted file]
templates/webpages/ir/_payments_master.html [deleted file]
templates/webpages/ir/form_footer.html [new file with mode: 0644]
templates/webpages/ir/form_footer_de.html [deleted file]
templates/webpages/ir/form_footer_en.html [deleted file]
templates/webpages/ir/form_footer_master.html [deleted file]
templates/webpages/ir/form_header.html [new file with mode: 0644]
templates/webpages/ir/form_header_de.html [deleted file]
templates/webpages/ir/form_header_en.html [deleted file]
templates/webpages/ir/form_header_master.html [deleted file]
templates/webpages/is/_payments.html [new file with mode: 0644]
templates/webpages/is/_payments_de.html [deleted file]
templates/webpages/is/_payments_en.html [deleted file]
templates/webpages/is/_payments_master.html [deleted file]
templates/webpages/is/form_footer.html [new file with mode: 0644]
templates/webpages/is/form_footer_de.html [deleted file]
templates/webpages/is/form_footer_en.html [deleted file]
templates/webpages/is/form_footer_master.html [deleted file]
templates/webpages/is/form_header.html [new file with mode: 0644]
templates/webpages/is/form_header_de.html [deleted file]
templates/webpages/is/form_header_en.html [deleted file]
templates/webpages/is/form_header_master.html [deleted file]
templates/webpages/login/auth_db_unreachable.html [new file with mode: 0644]
templates/webpages/login/auth_db_unreachable_de.html [deleted file]
templates/webpages/login/auth_db_unreachable_en.html [deleted file]
templates/webpages/login/auth_db_unreachable_master.html [deleted file]
templates/webpages/login/authentication_pl_missing.html [new file with mode: 0644]
templates/webpages/login/authentication_pl_missing_de.html [deleted file]
templates/webpages/login/authentication_pl_missing_en.html [deleted file]
templates/webpages/login/authentication_pl_missing_master.html [deleted file]
templates/webpages/login/company_logo.html [new file with mode: 0644]
templates/webpages/login/company_logo_de.html [deleted file]
templates/webpages/login/company_logo_en.html [deleted file]
templates/webpages/login/company_logo_master.html [deleted file]
templates/webpages/login/login_screen.html [new file with mode: 0644]
templates/webpages/login/login_screen_de.html [deleted file]
templates/webpages/login/login_screen_en.html [deleted file]
templates/webpages/login/login_screen_master.html [deleted file]
templates/webpages/login/password_error.html [new file with mode: 0644]
templates/webpages/login/password_error_de.html [deleted file]
templates/webpages/login/password_error_en.html [deleted file]
templates/webpages/login/password_error_master.html [deleted file]
templates/webpages/menu/menunew.html [new file with mode: 0644]
templates/webpages/menu/menunew_de.html [deleted file]
templates/webpages/menu/menunew_en.html [deleted file]
templates/webpages/menu/menunew_master.html [deleted file]
templates/webpages/menu/menuv3.html [new file with mode: 0644]
templates/webpages/menu/menuv3_de.html [deleted file]
templates/webpages/menu/menuv3_en.html [deleted file]
templates/webpages/menu/menuv3_master.html [deleted file]
templates/webpages/menu/menuv4.html [new file with mode: 0644]
templates/webpages/menu/menuv4_de.html [deleted file]
templates/webpages/menu/menuv4_en.html [deleted file]
templates/webpages/menu/menuv4_master.html [deleted file]
templates/webpages/oe/check_for_direct_delivery.html [new file with mode: 0644]
templates/webpages/oe/check_for_direct_delivery_de.html [deleted file]
templates/webpages/oe/check_for_direct_delivery_en.html [deleted file]
templates/webpages/oe/check_for_direct_delivery_master.html [deleted file]
templates/webpages/oe/form_footer.html [new file with mode: 0644]
templates/webpages/oe/form_footer_de.html [deleted file]
templates/webpages/oe/form_footer_en.html [deleted file]
templates/webpages/oe/form_footer_master.html [deleted file]
templates/webpages/oe/form_header.html [new file with mode: 0644]
templates/webpages/oe/form_header_de.html [deleted file]
templates/webpages/oe/form_header_en.html [deleted file]
templates/webpages/oe/form_header_master.html [deleted file]
templates/webpages/oe/orders_bottom.html [new file with mode: 0644]
templates/webpages/oe/orders_bottom_de.html [deleted file]
templates/webpages/oe/orders_bottom_en.html [deleted file]
templates/webpages/oe/orders_bottom_master.html [deleted file]
templates/webpages/oe/orders_top.html [new file with mode: 0644]
templates/webpages/oe/orders_top_de.html [deleted file]
templates/webpages/oe/orders_top_en.html [deleted file]
templates/webpages/oe/orders_top_master.html [deleted file]
templates/webpages/oe/report_for_todo_list.html [new file with mode: 0644]
templates/webpages/oe/report_for_todo_list_de.html [deleted file]
templates/webpages/oe/report_for_todo_list_en.html [deleted file]
templates/webpages/oe/report_for_todo_list_master.html [deleted file]
templates/webpages/oe/sales_order.html [new file with mode: 0644]
templates/webpages/oe/sales_order_de.html [deleted file]
templates/webpages/oe/sales_order_en.html [deleted file]
templates/webpages/oe/sales_order_master.html [deleted file]
templates/webpages/oe/search.html [new file with mode: 0644]
templates/webpages/oe/search_de.html [deleted file]
templates/webpages/oe/search_en.html [deleted file]
templates/webpages/oe/search_master.html [deleted file]
templates/webpages/projects/project_form.html [new file with mode: 0644]
templates/webpages/projects/project_form_de.html [deleted file]
templates/webpages/projects/project_form_en.html [deleted file]
templates/webpages/projects/project_form_master.html [deleted file]
templates/webpages/projects/search.html [new file with mode: 0644]
templates/webpages/projects/search_de.html [deleted file]
templates/webpages/projects/search_en.html [deleted file]
templates/webpages/projects/search_master.html [deleted file]
templates/webpages/report_generator/csv_export_options.html [new file with mode: 0644]
templates/webpages/report_generator/csv_export_options_de.html [deleted file]
templates/webpages/report_generator/csv_export_options_en.html [deleted file]
templates/webpages/report_generator/csv_export_options_master.html [deleted file]
templates/webpages/report_generator/html_report.html [new file with mode: 0644]
templates/webpages/report_generator/html_report_de.html [deleted file]
templates/webpages/report_generator/html_report_en.html [deleted file]
templates/webpages/report_generator/html_report_master.html [deleted file]
templates/webpages/report_generator/pdf_export_options.html [new file with mode: 0644]
templates/webpages/report_generator/pdf_export_options_de.html [deleted file]
templates/webpages/report_generator/pdf_export_options_en.html [deleted file]
templates/webpages/report_generator/pdf_export_options_master.html [deleted file]
templates/webpages/rp/aging_ar_bottom.html [new file with mode: 0644]
templates/webpages/rp/aging_ar_bottom_de.html [deleted file]
templates/webpages/rp/aging_ar_bottom_en.html [deleted file]
templates/webpages/rp/aging_ar_bottom_master.html [deleted file]
templates/webpages/rp/aging_ar_top.html [new file with mode: 0644]
templates/webpages/rp/aging_ar_top_de.html [deleted file]
templates/webpages/rp/aging_ar_top_en.html [deleted file]
templates/webpages/rp/aging_ar_top_master.html [deleted file]
templates/webpages/rp/balance_sheet.html [new file with mode: 0644]
templates/webpages/rp/balance_sheet_de.html [deleted file]
templates/webpages/rp/balance_sheet_en.html [deleted file]
templates/webpages/rp/balance_sheet_master.html [deleted file]
templates/webpages/rp/html_report_susa.html [new file with mode: 0644]
templates/webpages/rp/html_report_susa_de.html [deleted file]
templates/webpages/rp/html_report_susa_en.html [deleted file]
templates/webpages/rp/html_report_susa_master.html [deleted file]
templates/webpages/sepa/bank_transfer_add.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_add_de.html [deleted file]
templates/webpages/sepa/bank_transfer_add_en.html [deleted file]
templates/webpages/sepa/bank_transfer_add_master.html [deleted file]
templates/webpages/sepa/bank_transfer_create.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_create_de.html [deleted file]
templates/webpages/sepa/bank_transfer_create_en.html [deleted file]
templates/webpages/sepa/bank_transfer_create_master.html [deleted file]
templates/webpages/sepa/bank_transfer_created.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_created_de.html [deleted file]
templates/webpages/sepa/bank_transfer_created_en.html [deleted file]
templates/webpages/sepa/bank_transfer_created_master.html [deleted file]
templates/webpages/sepa/bank_transfer_edit.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_edit_de.html [deleted file]
templates/webpages/sepa/bank_transfer_edit_en.html [deleted file]
templates/webpages/sepa/bank_transfer_edit_master.html [deleted file]
templates/webpages/sepa/bank_transfer_list_bottom.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_list_bottom_de.html [deleted file]
templates/webpages/sepa/bank_transfer_list_bottom_en.html [deleted file]
templates/webpages/sepa/bank_transfer_list_bottom_master.html [deleted file]
templates/webpages/sepa/bank_transfer_list_top.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_list_top_de.html [deleted file]
templates/webpages/sepa/bank_transfer_list_top_en.html [deleted file]
templates/webpages/sepa/bank_transfer_list_top_master.html [deleted file]
templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html [deleted file]
templates/webpages/sepa/bank_transfer_mark_as_closed_step1_en.html [deleted file]
templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html [deleted file]
templates/webpages/sepa/bank_transfer_search.html [new file with mode: 0644]
templates/webpages/sepa/bank_transfer_search_de.html [deleted file]
templates/webpages/sepa/bank_transfer_search_en.html [deleted file]
templates/webpages/sepa/bank_transfer_search_master.html [deleted file]
templates/webpages/todo/show_todo_list.html [new file with mode: 0644]
templates/webpages/todo/show_todo_list_de.html [deleted file]
templates/webpages/todo/show_todo_list_en.html [deleted file]
templates/webpages/todo/show_todo_list_master.html [deleted file]
templates/webpages/ustva/config_step1.html [new file with mode: 0644]
templates/webpages/ustva/config_step1_de.html [deleted file]
templates/webpages/ustva/config_step1_en.html [deleted file]
templates/webpages/ustva/config_step1_master.html [deleted file]
templates/webpages/ustva/config_step2.html [new file with mode: 0644]
templates/webpages/ustva/config_step2_de.html [deleted file]
templates/webpages/ustva/config_step2_en.html [deleted file]
templates/webpages/ustva/config_step2_master.html [deleted file]
templates/webpages/ustva/generic_taxreport.html [new file with mode: 0644]
templates/webpages/ustva/generic_taxreport_de.html [deleted file]
templates/webpages/ustva/generic_taxreport_en.html [deleted file]
templates/webpages/ustva/generic_taxreport_master.html [deleted file]
templates/webpages/ustva/report.html [new file with mode: 0644]
templates/webpages/ustva/report_de.html [deleted file]
templates/webpages/ustva/report_en.html [deleted file]
templates/webpages/ustva/report_master.html [deleted file]
templates/webpages/webdav/_list.html [new file with mode: 0644]
templates/webpages/webdav/_list_de.html [deleted file]
templates/webpages/webdav/_list_en.html [deleted file]
templates/webpages/webdav/_list_master.html [deleted file]
templates/webpages/wh/journal_filter.html [new file with mode: 0644]
templates/webpages/wh/journal_filter_de.html [deleted file]
templates/webpages/wh/journal_filter_en.html [deleted file]
templates/webpages/wh/journal_filter_master.html [deleted file]
templates/webpages/wh/removal_parts_selection.html [new file with mode: 0644]
templates/webpages/wh/removal_parts_selection_de.html [deleted file]
templates/webpages/wh/removal_parts_selection_en.html [deleted file]
templates/webpages/wh/removal_parts_selection_master.html [deleted file]
templates/webpages/wh/report_filter.html [new file with mode: 0644]
templates/webpages/wh/report_filter_de.html [deleted file]
templates/webpages/wh/report_filter_en.html [deleted file]
templates/webpages/wh/report_filter_master.html [deleted file]
templates/webpages/wh/transfer_parts_selection.html [new file with mode: 0644]
templates/webpages/wh/transfer_parts_selection_de.html [deleted file]
templates/webpages/wh/transfer_parts_selection_en.html [deleted file]
templates/webpages/wh/transfer_parts_selection_master.html [deleted file]
templates/webpages/wh/warehouse_selection.html [new file with mode: 0644]
templates/webpages/wh/warehouse_selection_assembly.html [new file with mode: 0644]
templates/webpages/wh/warehouse_selection_assembly_de.html [deleted file]
templates/webpages/wh/warehouse_selection_assembly_en.html [deleted file]
templates/webpages/wh/warehouse_selection_assembly_master.html [deleted file]
templates/webpages/wh/warehouse_selection_de.html [deleted file]
templates/webpages/wh/warehouse_selection_en.html [deleted file]
templates/webpages/wh/warehouse_selection_master.html [deleted file]
templates/webpages/wh/warehouse_selection_stock.html [new file with mode: 0644]
templates/webpages/wh/warehouse_selection_stock_de.html [deleted file]
templates/webpages/wh/warehouse_selection_stock_en.html [deleted file]
templates/webpages/wh/warehouse_selection_stock_master.html [deleted file]

index 86f643378a64c02dfb6f611d15e8b34b4145e4f5..7b7cb290f9a677a8a67ed436e35ff3eb458cd2f0 100644 (file)
@@ -54,6 +54,7 @@ use SL::Menu;
 use SL::Template;
 use SL::User;
 use Template;
+use URI;
 use List::Util qw(first max min sum);
 use List::MoreUtils qw(any);
 
@@ -534,6 +535,26 @@ sub isblank {
   $main::lxdebug->leave_sub();
 }
 
+sub _get_request_uri {
+  my $self = shift;
+
+  return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
+
+  my $scheme =  $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
+  my $port   =  $ENV{SERVER_PORT} || '';
+  $port      =  undef if (($scheme eq 'http' ) && ($port == 80))
+                      || (($scheme eq 'https') && ($port == 443));
+
+  my $uri    =  URI->new("${scheme}://");
+  $uri->scheme($scheme);
+  $uri->port($port);
+  $uri->host($ENV{HTTP_HOST} || $ENV{SERVER_ADDR});
+  $uri->path_query($ENV{REQUEST_URI});
+  $uri->query('');
+
+  return $uri;
+}
+
 sub create_http_response {
   $main::lxdebug->enter_sub();
 
@@ -543,25 +564,19 @@ sub create_http_response {
   my $cgi      = $main::cgi;
   $cgi       ||= CGI->new('');
 
-  my $base_path;
-
-  if ($ENV{HTTP_X_FORWARDED_FOR}) {
-    $base_path =  $ENV{HTTP_REFERER};
-    $base_path =~ s|^.*?://.*?/|/|;
-  } else {
-    $base_path =  $ENV{REQUEST_URI};
-  }
-  $base_path =~ s|[^/]+$||;
-  $base_path =~ s|/$||;
-
   my $session_cookie;
   if (defined $main::auth) {
+    my $uri      = $self->_get_request_uri;
+    my @segments = $uri->path_segments;
+    pop @segments;
+    $uri->path_segments(@segments);
+
     my $session_cookie_value   = $main::auth->get_session_id();
     $session_cookie_value    ||= 'NO_SESSION';
 
     $session_cookie = $cgi->cookie('-name'   => $main::auth->get_session_cookie_name(),
                                    '-value'  => $session_cookie_value,
-                                   '-path'   => $base_path,
+                                   '-path'   => $uri->path,
                                    '-secure' => $ENV{HTTPS});
   }
 
@@ -714,6 +729,20 @@ sub ajax_response_header {
   return $output;
 }
 
+sub redirect_header {
+  my $self     = shift;
+  my $new_url  = shift;
+
+  my $base_uri = $self->_get_request_uri;
+  my $new_uri  = URI->new_abs($new_url, $base_uri);
+
+  die "Headers already sent" if $::self->{header};
+  $self->{header} = 1;
+
+  my $cgi = $main::cgi || CGI->new('');
+  return $cgi->redirect($new_uri);
+}
+
 sub _prepare_html_template {
   $main::lxdebug->enter_sub();
 
@@ -727,20 +756,16 @@ sub _prepare_html_template {
   }
   $language = "de" unless ($language);
 
-  if (-f "templates/webpages/${file}_${language}.html") {
-    if ((-f ".developer") &&
-        (-f "templates/webpages/${file}_master.html") &&
-        ((stat("templates/webpages/${file}_master.html"))[9] >
-         (stat("templates/webpages/${file}_${language}.html"))[9])) {
-      my $info = "Developer information: templates/webpages/${file}_master.html is newer than the localized version.\n" .
+  if (-f "templates/webpages/${file}.html") {
+    if ((-f ".developer") && ((stat("templates/webpages/${file}.html"))[9] > (stat("locale/${language}/all"))[9])) {
+      my $info = "Developer information: templates/webpages/${file}.html is newer than the translation file locale/${language}/all.\n" .
         "Please re-run 'locales.pl' in 'locale/${language}'.";
       print(qq|<pre>$info</pre>|);
       die($info);
     }
 
-    $file = "templates/webpages/${file}_${language}.html";
-  } elsif (-f "templates/webpages/${file}.html") {
     $file = "templates/webpages/${file}.html";
+
   } else {
     my $info = "Web page template '${file}' not found.\n" .
       "Please re-run 'locales.pl' in 'locale/${language}'.";
@@ -764,6 +789,7 @@ sub _prepare_html_template {
     $jsc_dateformat =~ s/m+/\%m/gi;
     $jsc_dateformat =~ s/y+/\%Y/gi;
     $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
+    $additional_params->{"myconfig"} ||= \%::myconfig;
   }
 
   $additional_params->{"conf_dbcharset"}              = $main::dbcharset;
@@ -819,10 +845,6 @@ sub parse_html_template {
   my $input = join('', <$in>);
   $in->close();
 
-  if ($main::locale) {
-    $input = $main::locale->{iconv}->convert($input);
-  }
-
   my $output;
   if (!$template->process(\$input, $additional_params, \$output)) {
     print STDERR $template->error();
@@ -3549,6 +3571,20 @@ handles business (thats customer/vendor types) sequences.
 special behaviour for empty strings in customerinitnumber field:
 will in this case not increase the value, and return undef.
 
+=item redirect_header $url
+
+Generates a HTTP redirection header for the new C<$url>. Constructs an
+absolute URL including scheme, host name and port. If C<$url> is a
+relative URL then it is considered relative to Lx-Office base URL.
+
+This function C<die>s if headers have already been created with
+C<$::form-E<gt>header>.
+
+Examples:
+
+  print $::form->redirect_header('oe.pl?action=edit&id=1234');
+  print $::form->redirect_header('http://www.lx-office.org/');
+
 =back
 
 =cut
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
new file mode 100644 (file)
index 0000000..692c396
--- /dev/null
@@ -0,0 +1,261 @@
+package SL::Template::Plugin::L;
+
+use base qw( Template::Plugin );
+use Template::Plugin;
+
+use strict;
+
+sub _H {
+  my $string = shift;
+  return $::locale->quote_special_chars('HTML', $string);
+}
+
+sub _hashify {
+  return (@_ && (ref($_[0]) eq 'HASH')) ? %{ $_[0] } : @_;
+}
+
+sub new {
+  my $class   = shift;
+  my $context = shift;
+
+  return bless { }, $class;
+}
+
+sub name_to_id {
+  my $self =  shift;
+  my $name =  shift;
+
+  $name    =~ s/[^\w_]/_/g;
+  $name    =~ s/_+/_/g;
+
+  return $name;
+}
+
+sub attributes {
+  my $self    = shift;
+  my %options = _hashify(@_);
+
+  my @result = ();
+  while (my ($name, $value) = each %options) {
+    next unless $name;
+    $value ||= '';
+    push @result, _H($name) . '="' . _H($value) . '"';
+  }
+
+  return @result ? ' ' . join(' ', @result) : '';
+}
+
+sub html_tag {
+  my $self       = shift;
+  my $tag        = shift;
+  my $content    = shift;
+  my $attributes = $self->attributes(@_);
+
+  return "<${tag}${attributes}/>" unless $content;
+  return "<${tag}${attributes}>${content}</${tag}>";
+}
+
+sub select_tag {
+  my $self            = shift;
+  my $name            = shift;
+  my $options_str     = shift;
+  my %attributes      = _hashify(@_);
+
+  $attributes{id}   ||= $self->name_to_id($name);
+
+  return $self->html_tag('select', $options_str, %attributes, name => $name);
+}
+
+sub checkbox_tag {
+  my $self             = shift;
+  my $name             = shift;
+  my %attributes       = _hashify(@_);
+
+  $attributes{id}    ||= $self->name_to_id($name);
+  $attributes{value}   = 1 unless defined $attributes{value};
+  my $label            = delete $attributes{label};
+
+  if ($attributes{checked}) {
+    $attributes{checked} = 'checked';
+  } else {
+    delete $attributes{checked};
+  }
+
+  my $code  = $self->html_tag('input', undef,  %attributes, name => $name, type => 'checkbox');
+  $code    .= $self->html_tag('label', $label, for => $attributes{id}) if $label;
+
+  return $code;
+}
+
+sub input_tag {
+  my $self            = shift;
+  my $name            = shift;
+  my $value           = shift;
+  my %attributes      = _hashify(@_);
+
+  $attributes{id}   ||= $self->name_to_id($name);
+  $attributes{type} ||= 'text';
+
+  return $self->html_tag('input', undef, %attributes, name => $name, value => $value);
+}
+
+sub options_for_select {
+  my $self          = shift;
+  my $collection    = shift;
+  my %options       = _hashify(@_);
+
+  my $value_key     = $options{value} || 'id';
+  my $title_key     = $options{title} || $value_key;
+
+  my @elements      = ();
+  push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty};
+
+  if ($collection && (ref $collection eq 'ARRAY')) {
+    foreach my $element (@{ $collection }) {
+      my @result = !ref $element            ? ( $element,               $element               )
+                 :  ref $element eq 'ARRAY' ? ( $element->[0],          $element->[1]          )
+                 :  ref $element eq 'HASH'  ? ( $element->{$value_key}, $element->{$title_key} )
+                 :                            ( $element->$value_key,   $element->$title_key   );
+
+      push @elements, \@result;
+    }
+  }
+
+  my $code = '';
+  foreach my $result (@elements) {
+    my %attributes = ( value => $result->[0] );
+    $attributes{selected} = 'selected' if $options{default} && ($options{default} eq ($result->[0] || ''));
+
+    $code .= $self->html_tag('option', _H($result->[1]), %attributes);
+  }
+
+  return $code;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SL::Templates::Plugin::L -- Layouting / tag generation
+
+=head1 SYNOPSIS
+
+Usage from a template:
+
+  [% USE L %]
+
+  [% L.select_tag('direction', [ [ 'left', 'To the left' ], [ 'right', 'To the right' ] ]) %]
+
+  [% L.select_tag('direction', L.options_for_select([ { direction => 'left',  display => 'To the left'  },
+                                                      { direction => 'right', display => 'To the right' } ],
+                                                    value => 'direction', title => 'display', default => 'right')) %]
+
+=head1 DESCRIPTION
+
+A module modeled a bit after Rails' ActionView helpers. Several small
+functions that create HTML tags from various kinds of data sources.
+
+=head1 FUNCTIONS
+
+=head2 LOW-LEVEL FUNCTIONS
+
+=over 4
+
+=item C<name_to_id $name>
+
+Converts a name to a HTML id by replacing various characters.
+
+=item C<attributes %items>
+
+Creates a string from all elements in C<%items> suitable for usage as
+HTML tag attributes. Keys and values are HTML escaped even though keys
+must not contain non-ASCII characters for browsers to accept them.
+
+=item C<html_tag $tag_name, $content_string, %attributes>
+
+Creates an opening and closing HTML tag for C<$tag_name> and puts
+C<$content_string> between the two. If C<$content_string> is undefined
+or empty then only a E<lt>tag/E<gt> tag will be created. Attributes
+are key/value pairs added to the opening tag.
+
+C<$content_string> is not HTML escaped.
+
+=back
+
+=head2 HIGH-LEVEL FUNCTIONS
+
+=over 4
+
+=item C<select_tag $name, $options_string, %attributes>
+
+Creates a HTML 'select' tag named C<$name> with the contents
+C<$options_string> and with arbitrary HTML attributes from
+C<%attributes>. The tag's C<id> defaults to C<name_to_id($name)>.
+
+The $options_string is usually created by the C<options_for_select>
+function.
+
+=item C<input_tag $name, $value, %attributes>
+
+Creates a HTML 'input type=text' tag named C<$name> with the value
+C<$value> and with arbitrary HTML attributes from C<%attributes>. The
+tag's C<id> defaults to C<name_to_id($name)>.
+
+=item C<checkbox_tag $name, %attributes>
+
+Creates a HTML 'input type=checkbox' tag named C<$name> with arbitrary
+HTML attributes from C<%attributes>. The tag's C<id> defaults to
+C<name_to_id($name)>. The tag's C<value> defaults to C<1>.
+
+If C<%attributes> contains a key C<label> then a HTML 'label' tag is
+created with said C<label>. No attribute named C<label> is created in
+that case.
+
+=back
+
+=head2 CONVERSION FUNCTIONS
+
+=over 4
+
+=item C<options_for_select \@collection, %options>
+
+Creates a string suitable for a HTML 'select' tag consisting of one
+'E<lt>optionE<gt>' tag for each element in C<\@collection>. The value
+to use and the title to display are extracted from the elements in
+C<\@collection>. Each element can be one of four things:
+
+=over 12
+
+=item 1. An array reference with at least two elements. The first element is
+the value, the second element is its title.
+
+=item 2. A scalar. The scalar is both the value and the title.
+
+=item 3. A hash reference. In this case C<%options> must contain
+I<value> and I<title> keys that name the keys in the element to use
+for the value and title respectively.
+
+=item 4. A blessed reference. In this case C<%options> must contain
+I<value> and I<title> keys that name functions called on the blessed
+reference whose return values are used as the value and title
+respectively.
+
+=back
+
+For cases 3 and 4 C<$options{value}> defaults to C<id> and
+C<$options{title}> defaults to C<$options{value}>.
+
+If the option C<with_empty> is set then an empty element (value
+C<undef>) will be used as the first element. The title to display for
+this element can be set with the option C<empty_title> and defaults to
+an empty string.
+
+=back
+
+=head1 MODULE AUTHORS
+
+Moritz Bunkus E<lt>m.bunkus@linet-services.deE<gt>
+
+L<http://linet-services.de>
index c26988beb3405c23580eee98a1a92d30a6e488f3..b36fcebeeebb3896e7ceb283f3e90119f256ec6d 100644 (file)
@@ -42,6 +42,8 @@ sub format_amount_units {
 sub format_percent {
   my ($self, $var, $places, $skip_zero) = @_;
 
+  $places ||= 2;
+
   return $self->format_amount($var * 100, $places, $skip_zero);
 }
 
@@ -106,4 +108,10 @@ sub abs {
   return $var < 0 ? $var * -1 : $var;
 }
 
+sub t8 {
+  my ($self, $text, @args) = @_;
+  $self->{locale} ||= Locale->new($::myconfig{countrycode}, 'all');
+  return $self->{locale}->text($text, @args) || $text;
+}
+
 1;
index 79fab96bbb4324b8b05ea493ded3b903a6e7546c..e736e0cd24635ca360bf20abe704a836be40db73 100644 (file)
@@ -6,19 +6,19 @@ use base qw( Template::Plugin::Filter );
 my $locale = undef;
 
 sub init {
-    my $self = shift;
+  my $self = shift;
 
-    $locale ||= Locale->new($main::myconfig{countrycode}, 'all');
+  $locale ||= Locale->new($main::myconfig{countrycode}, 'all');
 
-    # first arg can specify filter name
-    $self->install_filter($self->{ _ARGS }->[0] || 'T8');
+  # first arg can specify filter name
+  $self->install_filter($self->{ _ARGS }->[0] || 'T8');
 
-    return $self;
+  return $self;
 }
 
 sub filter {
-    my ($self, $text, $args) = @_;
-    return $locale->text($text, @{ $args || [] });
+  my ($self, $text, $args) = @_;
+  return $locale->text($text, @{ $args || [] }) || $text;
 }
 
 return 'SL::Template::Plugin::T8';
index ac7747e7e8af439342bdfdca9a062895621ebe5a..8c49dc23df38964cd53dc3b39b681048747fdb2d 100644 (file)
@@ -59,7 +59,7 @@ sub check_name {
                 'request_quotation_edit       | sales_quotation_edit      | purchase_order_edit | cash         |' .
                 'purchase_delivery_order_edit | sales_delivery_order_edit');
 
-  my ($name) = @_;
+  my ($name, %params) = @_;
 
   $name = $name eq "customer" ? "customer" : "vendor";
 
@@ -99,9 +99,17 @@ sub check_name {
       $form->{calctax}      = 1;
 
       # return one name or a list of names in $form->{name_list}
-      if (($i = $form->get_name(\%myconfig, $name)) > 1) {
-        &select_name($name);
-        exit;
+      $i = $form->get_name(\%myconfig, $name);
+
+      if ($i > 1) {
+        if ($params{no_select}) {
+          # $locale->text('Customer')
+          # $locale->text('Vendor')
+          $form->error($locale->text("More than one #1 found matching, please be more specific.", $locale->text(ucfirst $name)));
+        } else {
+          &select_name($name);
+          exit;
+        }
       }
 
       if ($i == 1) {
@@ -486,13 +494,13 @@ sub project_selected {
 
 sub continue       { call_sub($main::form->{"nextsub"}); }
 
-
 1;
 
 __END__
 
 =head1 NAME
 
+<<<<<<< HEAD:bin/mozilla/arap.pl
 bin/mozilla/arap.pl - helper routines for invoiceing frontend.
 
 =head1 SYNOPSIS
@@ -502,11 +510,26 @@ nothing yet
 =head1 DESCRIPTION
 
 nothing yet
+=======
+arap.pl - helper functions or customer/vendor retrieval
+
+=head1 SYNOPSIS
+
+ check_name('vendor')
+ check_project();
+
+=head1 DESCRIPTION
+
+Don't use anyting in this file without extreme care, and even then be prepared for massive headaches.
+
+It's a collection of helper routines that wrap the customer/vendor dropdown/textfield duality into something even complexer.
+>>>>>>> 88f5a78... check_name erweitert um ein no_select flag. siehe perldoc bin/mozilla/arap.pl:bin/mozilla/arap.pl
 
 =head1 FUNCTIONS
 
 =head2 check_name customer|vendor
 
+<<<<<<< HEAD:bin/mozilla/arap.pl
 check_name was originally meant to update the selected customer or vendor. The
 way it does that has generted more hate than almost any other part of this
 software.
@@ -593,5 +616,23 @@ are necessary in all steps and branches.
 
 Since get_customer and get_vendor clobber a lot of fields, make sure what
 changes exactly.
+=======
+This function will take the contents of $form->{vendor} or $form->{customer}, try to guess if there was a selectbox or not, and search for matching customer/vendors.
+
+This mostly works great, except for the case when there is more than one match.
+In that case check_name will display a select form, that will redirect to the
+original C<nextsub>. Unfortunately any hidden vars or input fields will be lost
+in the process unless saved before in a callback.
+
+If you still want to use it, you can disable this feature, like this:
+
+  check_name('customer', no_select => 1)
+
+In that case multiple matches will trigger an error.
+
+=head1 BUGS
+
+=head1 AUTHOR
+>>>>>>> 88f5a78... check_name erweitert um ein no_select flag. siehe perldoc bin/mozilla/arap.pl:bin/mozilla/arap.pl
 
 =cut
index defa5f1b024c310eb8fb3d76bed00843ad0baa57..c8ab34033caea6488b592ee774dab86a2ea33476 100644 (file)
@@ -9,6 +9,7 @@
 #
 ######################################################################
 
+use Carp;
 use SL::Common;
 use SL::DBUtils;
 use SL::Form;
@@ -508,6 +509,8 @@ sub show_history {
 
 # -------------------------------------------------------------------------
 
+my %_called_subs = ();
+
 sub call_sub {
   $main::lxdebug->enter_sub();
 
@@ -526,6 +529,9 @@ sub call_sub {
     $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
   }
 
+  $_called_subs{$name}++;
+  confess "RECURSION DETECTION: call_sub($name) called " . $_called_subs{$name} . " time(s)" if $_called_subs{$name} > 10;
+
   {
     no strict "refs";
     &{ $name }(@_);
index 312554e832403f70b042469381ad99657af7e1e3..1a317d0946b563f328b1dff38bb170ec73c6db81 100644 (file)
@@ -18,8 +18,8 @@ body {
   color: black;
 }
 
-/* .bg { 
-  background-image: url("mn_hauptmenu.png"); 
+/* .bg {
+  background-image: url("mn_hauptmenu.png");
 } */
 
 td {
@@ -28,7 +28,7 @@ td {
   font-size: 8pt;
   font-weight: normal;
 }
-td.hover:hover { 
+td.hover:hover {
        color: black;
 /*          background-color: #FFFFCC;
           font-size: 8pt;
@@ -85,12 +85,12 @@ body.menu {
 /*
        Überschriftsbalken
 */
-.listtop { 
-       background-color: rgb(236,233,216); 
+.listtop {
+       background-color: rgb(236,233,216);
        text-align:left;
        padding:5px;
-       font-size: 10pt; 
-       color: black; 
+       font-size: 10pt;
+       color: black;
        font-weight: bolder;
        border-style:dashed;
        border-width:thin;
@@ -111,12 +111,12 @@ body.menu {
        border-width:thin;
 }
 
-.listheading { 
-       font-size: 9pt; 
+.listheading, .listheading th {
+       font-size: 9pt;
        padding:3px;
-       background-color: 
-       rgb(236,233,216); 
-       color: black; 
+       background-color:
+       rgb(236,233,216);
+       color: black;
        font-weight: bolder;
        text-align:left;
        background-image: url("../image/fade.png");
@@ -124,19 +124,19 @@ body.menu {
        border-width:thin;
 }
 
-.listheadingcontent { 
-       font-size: 9pt; 
-       background-color: 
-       rgb(236,233,216); 
-       color: black; 
+.listheadingcontent {
+       font-size: 9pt;
+       background-color:
+       rgb(236,233,216);
+       color: black;
        font-weight: bolder;
        text-align:left;
 }
 
-.accountlistheading { 
-       font-size: 10pt; 
+.accountlistheading {
+       font-size: 10pt;
        padding:3px;
-       color: white; 
+       color: white;
        font-weight: bold;
        text-align:left;
        background-color:rgb(133,132,129);
@@ -158,18 +158,18 @@ body.menu {
        background:#efedde;
 }
 
-       
-.listrow1 { 
-       background-color: rgb(208,207,201); 
-       color: black; 
-       vertical-align: top; 
+
+.listrow1 {
+       background-color: rgb(208,207,201);
+       color: black;
+       vertical-align: top;
 }
 
 .listrow0 { background-color: rgb(236,233,216); color: black; vertical-align: top; }
 
 .listsubtotal { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: bolder;}
 
-.listtotal { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: bolder;}
+.listtotal, .listtotal td { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: bolder;}
 
 .submit {
   font-family: Verdana, Arial, Helvetica;
index 06485f9d6ff2c76ad5e69908388192bbe9ac259b..e61de8cd0de5624493a7080eba794b5042ae96ec 100644 (file)
@@ -183,7 +183,7 @@ $self->{texts} = {
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',
   'Application Error. No Format given' => 'Fehler in der Anwendung. Das Ausgabeformat fehlt.',
   'Application Error. Wrong Format' => 'Fehler in der Anwendung. Falsches Format: ',
-  'Applying [% HTML.escape(file) %]:' => 'F&uuml;hre [% HTML.escape(file) %] aus:',
+  'Applying #1:'                => 'Führe #1 aus:',
   'Approximately #1 prices will be updated.' => 'Ungefähr #1 Preise werden aktualisiert.',
   'Apr'                         => 'Apr',
   'April'                       => 'April',
@@ -806,7 +806,7 @@ $self->{texts} = {
   'IV'                          => 'IV',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => 'Wenn das automatische Erstellen einer Rechnung &uuml;ber Mahngeb&uuml;hren und Zinsen f&uuml;r ein Mahnlevel aktiviert ist, so werden die folgenden Konten f&uuml;r die Rechnung benutzt.',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => 'Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so k&ouml;nnen Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:',
-  '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 &quot;[% HTML.escape(backupdir) %]&quot;.' => 'Falls Sie sich entscheiden, Lx-Office die Migration durchf&uuml;hren zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis &quot;[% HTML.escape(backupdir) %]&quot; erstellen und die Dateien anschlie&szlig;end l&ouml;schen.',
+  '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 &quot;#1&quot;.' => 'Falls Sie sich entscheiden, Lx-Office die Migration durchführen zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis "#1" erstellen und die Dateien anschließend löschen.',
   'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => 'Wenn Sie f&uuml;r die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerpl&auml;tze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.',
   'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => 'Wenn Sie diese Meldung sehen haben Sie wahrscheinlich ein frisches LX-Office Setup und noch keine Buchungsgruppen eingerichtet. Ein Administrator kann dies im Systemmen&uuml; erledigen.',
   'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.' => 'Wenn Sie einen der Parameter &auml;ndern wollen, so dr&uuml;cken Sie auf den &quot;Zur&uuml;ck&quot;-Button, bearbeiten Sie die Datei &quot;config/authentication.pl&quot;, und melden Sie sich erneut im Administrationsbereich an.',
@@ -964,7 +964,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => 'Lx-Office kann solche Probleme automatisch beheben.',
   'Lx-Office has been switched to group-based access restrictions.' => 'Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.',
   'Lx-Office has found one or more problems in the general ledger.' => 'Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.',
-  'Lx-Office is about to update the database <b>[% HTML.escape(dbname) %]</b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.',
+  'Lx-Office is about to update the database <b>#1</b>.' => 'Lx-Office wird gleich die Datenbank <b>#1</b> aktualisieren.',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => 'Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.',
   'Lx-Office website'           => 'Lx-Office-Webseite',
   'MAILED'                      => 'Gesendet',
@@ -1011,6 +1011,7 @@ $self->{texts} = {
   'Module name'                 => 'Modulname',
   'Monat'                       => 'Monat',
   'Monthly'                     => 'monatlich',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Multi mode not supported.'   => 'Multimodus wird nicht unterstützt.',
   'Multibyte Encoding'          => 'Schriftsatz',
@@ -1021,7 +1022,7 @@ $self->{texts} = {
   'National Expenses'           => 'Aufwand Inland',
   'National Revenues'           => 'Erl&ouml;se Inland',
   'Netto Terms'                 => 'Zahlungsziel netto',
-  'New Buchungsgruppe [% loop.count %]' => 'Neue Buchungsgruppe [% loop.count %]',
+  'New Buchungsgruppe #1'       => 'Neue Buchungsgruppe #1',
   'New Templates'               => 'neue Vorlagen',
   'New Win/Tab'                 => 'Neues Fenster',
   'New assembly'                => 'Neues Erzeugnis',
@@ -1185,8 +1186,7 @@ $self->{texts} = {
   'Please enter the login for the new user.' => 'Bitte geben Sie das Login für den neuen Benutzer ein.',
   'Please enter the name of the database that will be used as the template for the new database:' => 'Bitte geben Sie den Namen der Datenbank an, die als Vorlage f&uuml;r die neue Datenbank benutzt wird:',
   'Please enter the name of the dataset you want to restore the backup in.' => 'Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen.',
-  'Please enter the taxnumber in the administration menu userpreferences' => 'Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul
-  angeben.',
+  'Please enter the taxnumber in the administration menu user preferences' => 'Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul angeben.',
   'Please enter values'         => 'Bitte Werte eingeben',
   'Please insert object dimensions below.' => 'Bitte geben Sie die Abmessungen unten ein',
   'Please insert your language values below' => 'Bitte die Übersetzungen unten eintragen',
@@ -1565,13 +1565,13 @@ $self->{texts} = {
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
   'The custom variable has been deleted.' => 'Die benutzerdefinierte Variable wurde gel&ouml;scht.',
   'The custom variable has been saved.' => 'Die benutzerdefinierte Variable wurde gespeichert.',
-  'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.',
+  'The database #1 has been successfully deleted.' => 'Die Datenbank #1 wurde erfolgreich gelöscht.',
   'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' => 'Die Datenbank zur Verwaltung der Benutzerdaten und zur Authentifizierung existiert nicht. Sie k&ouml;nnen Lx-Office diese Datenbank mit den folgenden Parametern anlegen lassen:',
-  'The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:',
+  'The database update/creation did not succeed. The file #1 contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei #1 enthielt den folgenden Fehler:',
   'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.',
   'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.',
-  'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.',
-  'The dataset backup has been sent via email to [% HTML.escape(to) %].' => 'Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.',
+  'The dataset #1 has been successfully created.' => 'Die Datenbank #1 wurde erfolgreich angelegt.',
+  'The dataset backup has been sent via email to #1.' => 'Die Datenbanksicherung wurde per Email an #1 verschickt.',
   'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
   'The dataset name is missing.' => 'Der Datenbankname fehlt.',
   'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes h&auml;ngt vom Variablentypen ab:',
@@ -1610,7 +1610,7 @@ $self->{texts} = {
   'The name is missing in row %d.' => 'Der Name fehlt in Zeile %d.',
   'The name is missing.'        => 'Der Name fehlt.',
   'The name must only consist of letters, numbers and underscores and start with a letter.' => 'Der Name darf nur aus Buchstaben (keine Umlaute), Ziffern und Unterstrichen bestehen und muss mit einem Buchstaben beginnen.',
-  'The old file containing the user information is still present (&quot;[% HTML.escape(memberfile) %]&quot;). 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. ' => 'Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;[% HTML.escape(memberfile) %]&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden k&ouml;nnen.',
+  'The old file containing the user information is still present (&quot;#1&quot;). 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.' => 'Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;#1&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden können.',
   'The option field is empty.'  => 'Das Optionsfeld ist leer.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
@@ -1621,7 +1621,7 @@ $self->{texts} = {
   'The pg_dump process could not be started.' => 'Der pg_dump-Prozess konnte nicht gestartet werden.',
   'The pg_restore process could not be started.' => 'Der pg_restore-Prozess konnte nicht gestartet werden.',
   'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => 'Die bevorzugte Art, ein Perl-Modul zu installieren, ist durch Installation eines von Ihrem Betriebssystem zur Verf&uuml;gung gestellten Paketes (z.B. Debian-Pakete oder RPM).',
-  'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
+  'The program\'s exit code was #1 (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war #1 (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
   'The project has been added.' => 'Das Projekt wurde erfasst.',
   'The project has been saved.' => 'Das Projekt wurde gespeichert.',
   'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' => 'Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:',
@@ -1679,7 +1679,7 @@ $self->{texts} = {
   'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
   'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',
   'This group will be called &quot;Full Access&quot;.' => 'Diese Gruppe wird &quot;Vollzugriff&quot; genannt.',
-  'This installation uses an unknown chart of accounts (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;[% HTML.escape(coa) %]&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
+  'This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;#1&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!',
   'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' => 'Diese Liste ist auf 15 Zeilen begrenzt. Wenn Sie eine vollständige Liste benötigen, erstellen Sie bitte einen Bericht.',
   '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.' => 'Das bedeutet, dass ein Benutzer eine Kreditorenbuchung angelegt und in ihr einen Umsatzsteuer-Steuerschlüssel verwendet oder eine Debitorenbuchung mit Vorsteuer-Steuerschlüssel angelegt hat.',
@@ -1696,7 +1696,7 @@ $self->{texts} = {
   'To (email)'                  => 'An',
   'To (time)'                   => 'Bis',
   'To Date'                     => 'Bis',
-  '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.' => 'Um einer Gruppe einen neuen Benutzer hinzuzuf&uuml;gen, passen Sie die Daten eines Benutzers an, und drücken Sie "als neu speichern". Unter dem neuen Namen wird dann ein Benutzer mit denselben Gruppenrechten angelegt.',
+  '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.' => 'Um einer Gruppe einen neuen Benutzer hinzuzufügen, ändern und speichern Sie am einfachsten einen bestehen den Zugriffsnamen. Unter dem neuen Namen wird dann ein Benutzer mit denselben Einstellungen angelegt.',
   'Top'                         => 'Oben',
   'Top (CSS)'                   => 'Oben (mit CSS)',
   'Top (CSS) new'               => 'Oben (mit CSS, neu)',
@@ -1878,6 +1878,7 @@ $self->{texts} = {
   'You have to specify a department.' => 'Sie müssen eine Abteilung wählen.',
   'You have to specify an execution date for each antry.' => 'Sie müssen für jeden zu buchenden Eintrag ein Ausführungsdatum angeben.',
   'You must chose a user.'      => 'Sie m&uuml;ssen einen Benutzer ausw&auml;hlen.',
+  'You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist.',
   'You will now be forwarded to the administration panel.' => 'Sie werden nun zum Administrationsbereich weitergeleitet.',
   'You\'re not editing a file.' => 'Sie bearbeiten momentan keine Datei.',
   'You\'ve already chosen the following limitations:' => 'Sie haben bereits die folgenden Einschr&auml;nkungen vorgenommen:',
@@ -1958,7 +1959,6 @@ $self->{texts} = {
   'logout'                      => 'abmelden',
   'male'                        => 'männlich',
   'mark as paid'                => 'als bezahlt markieren',
-  'master'                      => 'de',
   'missing'                     => 'Fehlbestand',
   'month'                       => 'Monatliche Abgabe',
   'new Window'                  => 'neues Fenster',
index 4cabe32aa7dc2595229b9abefddce9009edd348c..7f21bb5811aef06900c589a4e2931d82061e0a16 100644 (file)
@@ -150,6 +150,7 @@ $self->{texts} = {
   'Missing amount'              => 'Fehlbetrag',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index cdd81c4d0784b8dffe3c10eaf98185835384b67a..0ec18bc679ce8ca11dffe6f8054455001f36e1f9 100644 (file)
@@ -154,6 +154,7 @@ $self->{texts} = {
   'Missing amount'              => 'Fehlbetrag',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index aa5dcaf736b9b2dddc792f1031e43797a0394dea..de6f9808eeca3090fb3c38e983f5bd5c077aea65 100644 (file)
@@ -46,6 +46,7 @@ $self->{texts} = {
   'Create and edit sales quotations' => 'Angebote erfassen und bearbeiten',
   'Create and edit vendor invoices' => 'Eingangsrechnungen erfassen und bearbeiten',
   'Credit Note'                 => 'Gutschrift',
+  'Customer'                    => 'Kunde',
   'Customer Number'             => 'Kundennummer',
   'Customer details'            => 'Kundendetails',
   'Customer not on file or locked!' => 'Dieser Kunde existiert nicht oder ist gesperrt.',
@@ -79,6 +80,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
@@ -135,6 +137,7 @@ $self->{texts} = {
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
+  'Vendor'                      => 'Lieferant',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',
   'Vendor not on file!'         => 'Lieferant ist nicht in der Datenbank!',
index 11ee8881000e11ee2e4e77f0c3844b9ea8023a2f..687b97d67fdc375c213febd5f1d6a90d68be114b 100644 (file)
@@ -96,6 +96,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index d2f4471a0a85c15fd6e6a90f007d45eba41804ff..5443cd89ea32915b0fca8a9295b70a8437b407d4 100644 (file)
@@ -155,6 +155,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index ebfdc15080ad96448a70e50094b12256c6b89fb2..70855b1fa01d1e400a531189912ce19de0842b5f 100644 (file)
@@ -281,7 +281,6 @@ $self->{subs} = {
   'cov_selection_internal'      => 'cov_selection_internal',
   'customer_details'            => 'customer_details',
   'delivery_customer_selection' => 'delivery_customer_selection',
-  'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'edit_e_mail'                 => 'edit_e_mail',
   'format_dates'                => 'format_dates',
index 5ff645a7e43a82ba0ca22e34e6d4dc0f93478b84..7ae7c84548230dc0a0bb1781ec7395ae950fa3e5 100644 (file)
@@ -148,6 +148,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index d328f54cdcbe8d0f444d977dea77a5cf884d34d9..eecb8274b21a468064980cc633ffaae5c01340a7 100644 (file)
@@ -153,6 +153,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index 701cacec0582b2d9416fc35aeb69b229cda17229..efe2659d9e41193e9ea892a98dc3ea7cfccd125e 100755 (executable)
@@ -6,27 +6,35 @@
 # this version of locles processes not only all required .pl files
 # but also all parse_html_templated files.
 
+use strict;
+
 use Data::Dumper;
+use English;
 use FileHandle;
 use Getopt::Long;
 use List::Util qw(first);
 use POSIX;
 use Pod::Usage;
 
-$| = 1;
+$OUTPUT_AUTOFLUSH = 1;
+
+my $basedir      = "../..";
+my $bindir       = "$basedir/bin/mozilla";
+my $dbupdir      = "$basedir/sql/Pg-upgrade";
+my $dbupdir2     = "$basedir/sql/Pg-upgrade2";
+my $menufile     = "menu.ini";
+my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
 
-$basedir  = "../..";
-$bindir   = "$basedir/bin/mozilla";
-$dbupdir  = "$basedir/sql/Pg-upgrade";
-$dbupdir2 = "$basedir/sql/Pg-upgrade2";
-$menufile = "menu.ini";
-$submitsearch = qr/type\s*=\s*[\"\']?submit/i;
+my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %subrt);
 
-%referenced_html_files = ();
+my $count  = 0;
+my $notext = 0;
 
-my $opt_v = 0;
-my $opt_n = 0;
-my $opt_c = 0;
+my $debug  = 0;
+
+my $opt_v  = 0;
+my $opt_n  = 0;
+my $opt_c  = 0;
 
 sub parse_args {
   my ($help, $man);
@@ -51,12 +59,13 @@ sub parse_args {
 parse_args();
 
 opendir DIR, "$bindir" or die "$!";
-@progfiles = grep { /\.pl$/ && !/(_|^\.)/ } readdir DIR;
+my @progfiles = grep { /\.pl$/ && !/(_custom|^\.)/ } readdir DIR;
 seekdir DIR, 0;
-@customfiles = grep /_/, readdir DIR;
+my @customfiles = grep /_custom/, readdir DIR;
 closedir DIR;
 
 # put customized files into @customfiles
+my @menufiles;
 
 if ($opt_n) {
   @customfiles = ();
@@ -69,26 +78,32 @@ if ($opt_n) {
 }
 
 opendir DIR, $dbupdir or die "$!";
-@dbplfiles = grep { /\.pl$/ } readdir DIR;
+my @dbplfiles = grep { /\.pl$/ } readdir DIR;
 closedir DIR;
 
 opendir DIR, $dbupdir2 or die "$!";
-@dbplfiles2 = grep { /\.pl$/ } readdir DIR;
+my @dbplfiles2 = grep { /\.pl$/ } readdir DIR;
 closedir DIR;
 
 # slurp the translations in
+our $self    = {};
+our $missing = {};
+our @missing = ();
+our @lost    = ();
+
 if (-f 'all') {
-  require "all";
+  require 'all';
+}
+if (-f 'missing') {
+  require 'missing' ;
+  unlink 'missing';
+}
+if (-f 'lost') {
+  require 'lost';
+  unlink 'lost';
 }
 
-my %old_texts = %{ $self->{texts} };
-
-# Read HTML templates.
-#%htmllocale = ();
-#@htmltemplates = <../../templates/webpages/*/*_master.html>;
-#foreach $file (@htmltemplates) {
-#  scanhtmlfile($file);
-#}
+my %old_texts = %{ $self->{texts} || {} };
 
 map({ handle_file($_, $bindir); } @progfiles);
 map({ handle_file($_, $dbupdir); } @dbplfiles);
@@ -104,7 +119,7 @@ sub handle_file {
   &scanfile("$dir/$file");
 
   # scan custom_{module}.pl or {login}_{module}.pl files
-  foreach $customfile (@customfiles) {
+  foreach my $customfile (@customfiles) {
     if ($customfile =~ /_$file/) {
       if (-f "$dir/$customfile") {
         &scanfile("$dir/$customfile");
@@ -114,13 +129,13 @@ sub handle_file {
 
   # if this is the menu.pl file
   if ($file eq 'menu.pl') {
-    foreach $item (@menufiles) {
+    foreach my $item (@menufiles) {
       &scanmenu("$basedir/$item");
     }
   }
 
   if ($file eq 'menunew.pl') {
-    foreach $item (@menufiles) {
+    foreach my $item (@menufiles) {
       &scanmenu("$basedir/$item");
       print "." if $opt_v;
     }
@@ -128,10 +143,7 @@ sub handle_file {
 
   $file =~ s/\.pl//;
 
-  eval { require 'missing'; };
-  unlink 'missing';
-
-  foreach $text (keys %$missing) {
+  foreach my $text (keys %$missing) {
     if ($locale{$text} || $htmllocale{$text}) {
       unless ($self->{texts}{$text}) {
         $self->{texts}{$text} = $missing->{$text};
@@ -146,18 +158,14 @@ sub handle_file {
 $self->{texts} = {
 |;
 
-  foreach $key (sort keys %locale) {
-    if ($self->{texts}{$key}) {
-      $text = $self->{texts}{$key};
-    } else {
-      $text = $key;
-    }
-    $text =~ s/'/\\'/g;
-    $text =~ s/\\$/\\\\/;
+  foreach my $key (sort keys %locale) {
+    my $text    =  $self->{texts}{$key} || $key;
+    $text       =~ s/'/\\'/g;
+    $text       =~ s/\\$/\\\\/;
 
-    $keytext = $key;
-    $keytext =~ s/'/\\'/g;
-    $keytext =~ s/\\$/\\\\/;
+    my $keytext =  $key;
+    $keytext    =~ s/'/\\'/g;
+    $keytext    =~ s/\\$/\\\\/;
 
     print FH qq|  '$keytext'|
       . (' ' x (27 - length($keytext)))
@@ -169,26 +177,26 @@ $self->{texts} = {
 $self->{subs} = {
 |;
 
-  foreach $key (sort keys %subrt) {
-    $text = $key;
-    $text =~ s/'/\\'/g;
-    $text =~ s/\\$/\\\\/;
+  foreach my $key (sort keys %subrt) {
+    my $text =  $key;
+    $text    =~ s/'/\\'/g;
+    $text    =~ s/\\$/\\\\/;
     print FH qq|  '$text'| . (' ' x (27 - length($text))) . qq| => '$text',\n|;
   }
 
-  foreach $key (sort keys %submit) {
-    $text = ($self->{texts}{$key}) ? $self->{texts}{$key} : $key;
-    $text =~ s/'/\\'/g;
-    $text =~ s/\\$/\\\\/;
+  foreach my $key (sort keys %submit) {
+    my $text           =  ($self->{texts}{$key}) ? $self->{texts}{$key} : $key;
+    $text              =~ s/'/\\'/g;
+    $text              =~ s/\\$/\\\\/;
 
-    $english_sub = $key;
-    $english_sub =~ s/'/\\'/g;
-    $english_sub =~ s/\\$/\\\\/;
-    $english_sub = lc $key;
+    my $english_sub    =  $key;
+    $english_sub       =~ s/'/\\'/g;
+    $english_sub       =~ s/\\$/\\\\/;
+    $english_sub       = lc $key;
 
-    $translated_sub = lc $text;
-    $english_sub    =~ s/( |-|,)/_/g;
-    $translated_sub =~ s/( |-|,)/_/g;
+    my $translated_sub =  lc $text;
+    $english_sub       =~ s/( |-|,)/_/g;
+    $translated_sub    =~ s/( |-|,)/_/g;
     print FH qq|  '$translated_sub'|
       . (' ' x (27 - length($translated_sub)))
       . qq| => '$english_sub',\n|;
@@ -203,10 +211,6 @@ $self->{subs} = {
 
 }
 
-#foreach $file (@htmltemplates) {
-#  converthtmlfile($file);
-#}
-
 # now print out all
 
 open FH, ">all" or die "$! : all";
@@ -221,8 +225,8 @@ print FH q|#!/usr/bin/perl
 $self->{texts} = {
 |;
 
-foreach $key (sort keys %alllocales) {
-  $text = $self->{texts}{$key};
+foreach my $key (sort keys %alllocales) {
+  my $text = $self->{texts}{$key};
 
   $count++;
 
@@ -257,7 +261,7 @@ if (@missing) {
 $missing = {
 |;
 
-  foreach $text (@missing) {
+  foreach my $text (@missing) {
     print FH qq|  '$text'| . (' ' x (27 - length($text))) . qq| => '',\n|;
   }
 
@@ -270,14 +274,7 @@ $missing = {
 
 }
 
-@lost = ();
-
-if (-f "lost") {
-  require "lost";
-  unlink "lost";
-}
-
-while (($text, $translation) = each %old_texts) {
+while (my ($text, $translation) = each %old_texts) {
   next if ($alllocales{$text});
 
   push @lost, { 'text' => $text, 'translation' => $translation };
@@ -292,7 +289,7 @@ if (scalar @lost) {
     "# This file will be auto-generated by locales.pl. Do not edit it.\n\n" .
     "\@lost = (\n";
 
-  foreach $entry (@lost) {
+  foreach my $entry (@lost) {
     $entry->{text}        =~ s/\'/\\\'/g;
     $entry->{translation} =~ s/\'/\\\'/g;
     print FH "  { 'text' => '$entry->{text}', 'translation' => '$entry->{translation}' },\n";
@@ -303,17 +300,16 @@ if (scalar @lost) {
 }
 
 open(FH, "LANGUAGE");
-@language = <FH>;
+my @language = <FH>;
 close(FH);
-$trlanguage = $language[0];
+my $trlanguage = $language[0];
 chomp $trlanguage;
 
 if ($opt_c) {
   search_unused_htmlfiles();
-  search_translated_htmlfiles_wo_master();
 }
 
-$per = sprintf("%.1f", ($count - $notext) / $count * 100);
+my $per = sprintf("%.1f", ($count - $notext) / $count * 100);
 print "\n$trlanguage - ${per}%";
 print " - $notext/$count missing" if $notext;
 print "\n";
@@ -413,13 +409,12 @@ sub scanfile {
 
       # is this a template call?
       if (/parse_html_template2?\s*\(\s*[\"\']([\w\/]+)\s*[\"\']/) {
-        my $newfile = "$basedir/templates/webpages/$1_master.html";
+        my $newfile = "$basedir/templates/webpages/$1.html";
         if (/parse_html_template2/) {
           print "E: " . strip_base($file) . " is still using 'parse_html_template2' for " . strip_base($newfile) . ".\n";
         }
         if (-f $newfile) {
 #           &scanhtmlfile($newfile);
-#           &converthtmlfile($newfile);
            $cached{$file}{scanh}{$newfile} = 1;
           print "." if $opt_v;
         } elsif ($opt_c) {
@@ -430,7 +425,7 @@ sub scanfile {
       # is this a sub ?
       if (/^sub /) {
         next if ($dont_include_subs);
-        ($null, $subrt) = split / +/;
+        my $subrt = (split / +/)[1];
 #        $subrt{$subrt} = 1;
         $cached{$file}{subr}{$subrt} = 1;
         next;
@@ -525,8 +520,8 @@ sub scanmenu {
   grep { s/(\[|\])//g } @a;
 
   foreach my $item (@a) {
-    @b = split /--/, $item;
-    foreach $string (@b) {
+    my @b = split /--/, $item;
+    foreach my $string (@b) {
       chomp $string;
       $locale{$string}     = 1;
       $alllocales{$string} = 1;
@@ -535,17 +530,25 @@ sub scanmenu {
 
 }
 
+sub unescape_template_string {
+  my $in =  "$_[0]";
+  $in    =~ s/\\(.)/$1/g;
+  return $in;
+}
+
 sub scanhtmlfile {
   local *IN;
 
-  if (!defined $cached{$_[0]}) {
+  my $file = shift;
+
+  if (!defined $cached{$file}) {
     my %plugins = ( 'loaded' => { }, 'needed' => { } );
 
-    open(IN, $_[0]) || die $_[0];
+    open(IN, $file) || die $file;
 
-    my $copying = 0;
+    my $copying  = 0;
     my $issubmit = 0;
-    my $text = "";
+    my $text     = "";
     while (my $line = <IN>) {
       chomp($line);
 
@@ -558,61 +561,55 @@ sub scanhtmlfile {
         $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator));
       }
 
-      while ($line =~ m/\[\%            # Template-Start-Tag
-                        [\-~#]*         # Whitespace-Unterdrückung
-                        \s*             # Optional beliebig viele Whitespace
-                        [\'\"]          # Anfang des zu übersetzenden Strings
-                        (.*?)           # Der zu übersetzende String
-                        [\'\"]          # Ende des zu übersetzenden Strings
-                        \s*\|\s*        # Pipe-Zeichen mit optionalen Whitespace davor und danach
-                        \$T8            # Filteraufruf
-                        .*?             # Optionale Argumente für den Filter und Whitespaces
-                        [\-~#]*         # Whitespace-Unterdrückung
-                        \%\]            # Template-Ende-Tag
+      while ($line =~ m/(?:             # Start von Variante 1: LxERP.t8('...'); ohne darumliegende [% ... %]-Tags
+                          (LxERP\.t8)\( #   LxERP.t8(                             ::Parameter $1::
+                          ([\'\"])      #   Anfang des zu übersetzenden Strings   ::Parameter $2::
+                          (.*?)         #   Der zu übersetzende String            ::Parameter $3::
+                          (?<!\\)\2     #   Ende des zu übersetzenden Strings
+                        |               # Start von Variante 2: [% '...' | $T8 %]
+                          \[\%          #   Template-Start-Tag
+                          [\-~#]*       #   Whitespace-Unterdrückung
+                          \s*           #   Optional beliebig viele Whitespace
+                          ([\'\"])      #   Anfang des zu übersetzenden Strings   ::Parameter $4::
+                          (.*?)         #   Der zu übersetzende String            ::Parameter $5::
+                          (?<!\\)\4     #   Ende des zu übersetzenden Strings
+                          \s*\|\s*      #   Pipe-Zeichen mit optionalen Whitespace davor und danach
+                          (\$T8)        #   Filteraufruf                          ::Parameter $6::
+                          .*?           #   Optionale Argumente für den Filter
+                          \s*           #   Whitespaces
+                          [\-~#]*       #   Whitespace-Unterdrückung
+                          \%\]          #   Template-Ende-Tag
+                        )
                        /ix) {
-#        print "Found filter '$1' in string '$line'\n";
-        $cached{$_[0]}{all}{$1}  = 1;
-        $cached{$_[0]}{html}{$1} = 1;
-        $plugins{needed}->{T8}   = 1;
-        substr $line, $-[0], $+[0] - $-[0], '';
+        my $module = $1 || $6;
+        my $string = $3 || $5;
+        print "Found filter >>>$string<<<\n" if $debug;
+        substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], '';
+
+        $string                         = unescape_template_string($string);
+        $cached{$file}{all}{$string}    = 1;
+        $cached{$file}{html}{$string}   = 1;
+        $cached{$file}{submit}{$string} = 1 if $PREMATCH =~ /$submitsearch/;
+        $plugins{needed}->{T8}          = 1 if $module eq '$T8';
+        $plugins{needed}->{LxERP}       = 1 if $module eq 'LxERP.t8';
       }
 
-      while ("" ne $line) {
-        if (!$copying) {
-          if ($line =~ m|<translate>|i) {
-            my $eom = $+[0];
-            if ($` =~ /$submitsearch/) {
-              $issubmit = 1
-            }
-            substr($line, 0, $eom) = "";
-            $copying = 1;
-          } else {
-            $line = "";
-          }
-
-        } else {
-          if ($line =~ m|</translate>|i) {
-            $text .= $`;
-            substr($line, 0, $+[0]) = "";
-            $text =~ s/\s+/ /g;
-
-            $copying = 0;
-            if ($issubmit) {
-  #            $submit{$text} = 1;
-               $cached{$_[0]}{submit}{$text} = 1;
-              $issubmit = 0;
-            }
-  #          $alllocales{$text} = 1;
-             $cached{$_[0]}{all}{$text} = 1;
-  #          $htmllocale{$text} = 1;
-             $cached{$_[0]}{html}{$text} = 1;
-            $text = "";
-
-          } else {
-            $text .= $line;
-            $line = "";
-          }
-        }
+      while ($line =~ m/\[\%          # Template-Start-Tag
+                        [\-~#]?       # Whitespace-Unterdrückung
+                        \s*           # Optional beliebig viele Whitespace
+                        (?:           # Die erkannten Template-Direktiven
+                          PROCESS
+                        |
+                          INCLUDE
+                        )
+                        \s+           # Mindestens ein Whitespace
+                        [\'\"]?       # Anfang des Dateinamens
+                        ([^\s]+)      # Beliebig viele Nicht-Whitespaces -- Dateiname
+                        \.html        # Endung ".html", ansonsten kann es der Name eines Blocks sein
+                       /ix) {
+        my $new_file_name = "$basedir/templates/webpages/$1.html";
+        $cached{$file}{scanh}{$new_file_name} = 1;
+        substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], '';
       }
     }
 
@@ -620,75 +617,18 @@ sub scanhtmlfile {
 
     foreach my $plugin (keys %{ $plugins{needed} }) {
       next if ($plugins{loaded}->{$plugin});
-      print "E: " . strip_base($_[0]) . " requires the Template plugin '$plugin', but is not loaded with '[\% USE $plugin \%]'.\n";
+      print "E: " . strip_base($file) . " requires the Template plugin '$plugin', but is not loaded with '[\% USE $plugin \%]'.\n";
     }
-
-    &converthtmlfile($_[0]);
   }
 
   # copy back into global arrays
-  map { $alllocales{$_} = 1 } keys %{$cached{$_[0]}{all}};
-  map { $htmllocale{$_} = 1 } keys %{$cached{$_[0]}{html}};
-  map { $submit{$_} = 1 }     keys %{$cached{$_[0]}{submit}};
-}
-
-sub converthtmlfile {
-  local *IN;
-  local *OUT;
-
-  my $file = shift;
-
-  open(IN, $file) || die;
-
-  my $langcode = (split("/", getcwd()))[-1];
-  $file =~ s/_master.html$/_${langcode}.html/;
-
-  open(OUT, ">$file") || die;
-
-  my $copying = 0;
-  my $text = "";
-  while (my $line = <IN>) {
-    chomp($line);
-    if ("" eq $line) {
-      print(OUT "\n");
-      next;
-    }
+  map { $alllocales{$_} = 1 } keys %{$cached{$file}{all}};
+  map { $htmllocale{$_} = 1 } keys %{$cached{$file}{html}};
+  map { $submit{$_} = 1 }     keys %{$cached{$file}{submit}};
 
-    while ("" ne $line) {
-      if (!$copying) {
-        if ($line =~ m|<translate>|i) {
-          print(OUT $`);
-          substr($line, 0, $+[0]) = "";
-          $copying = 1;
-          print(OUT "\n") if ("" eq $line);
-
-        } else {
-          print(OUT "${line}\n");
-          $line = "";
-        }
-
-      } else {
-        if ($line =~ m|</translate>|i) {
-          $text .= $`;
-          substr($line, 0, $+[0]) = "";
-          $text =~ s/\s+/ /g;
-          $copying = 0;
-          $alllocales{$text} = 1;
-          $htmllocale{$text} = 1;
-          print(OUT $self->{"texts"}{$text} || $text);
-          print(OUT "\n") if ("" eq $line);
-          $text = "";
-
-        } else {
-          $text .= $line;
-          $line = "";
-        }
-      }
-    }
-  }
+  map { scanhtmlfile($_)  }   keys %{$cached{$file}{scanh}};
 
-  close(IN);
-  close(OUT);
+  @referenced_html_files{keys %{$cached{$file}{scanh}}} = (1) x scalar keys %{$cached{$file}{scanh}};
 }
 
 sub search_unused_htmlfiles {
@@ -709,27 +649,6 @@ sub search_unused_htmlfiles {
   }
 }
 
-sub search_translated_htmlfiles_wo_master {
-  my @unscanned_dirs = ('../../templates/webpages');
-
-  while (scalar @unscanned_dirs) {
-    my $dir = shift @unscanned_dirs;
-
-    foreach my $entry (<$dir/*>) {
-      if (-d $entry) {
-        push @unscanned_dirs, $entry;
-
-      } elsif (($entry =~ /_[a-z]+\.html$/) && ($entry !~ /_master.html$/) && -f $entry) {
-        my $master =  $entry;
-        $master    =~ s/[a-z]+\.html$/master.html/;
-        if (! -f $master) {
-          print "W: translated HTML template without master: " . strip_base($entry) . "\n";
-        }
-      }
-    }
-  }
-}
-
 sub strip_base {
   my $s =  "$_[0]";             # Create a copy of the string.
 
index fa52176d328b5bfce6fe1a64441c717aaaf88286..c39e352022196b829e0cb215a4d8f61c6feafd97 100644 (file)
@@ -199,6 +199,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index 46e5e18a236f836b93af7e26fdee8709b48319c0..7f3abcfe7e984da8c8ff7646d77b734a2680500a 100644 (file)
@@ -181,6 +181,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index 9c9b71df305a7c348e9f880fa34b0195e0ff2c07..2b85eca04d35dbf588cf4f29d28a2df3116725a8 100644 (file)
@@ -143,6 +143,7 @@ $self->{texts} = {
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
   'Monthly'                     => 'monatlich',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
index 2072ad4e632c4f312723955302c79b3408032c9c..768bc63ca026ff5fb828c772b5968967de27a6c7 100644 (file)
@@ -196,6 +196,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/scripts/migrate_template_to_t8.pl b/scripts/migrate_template_to_t8.pl
new file mode 100755 (executable)
index 0000000..ac14561
--- /dev/null
@@ -0,0 +1,159 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Pod::Usage;
+use List::Util qw(reduce);
+use List::MoreUtils qw(zip);
+
+use constant DEBUG => 0;
+
+unless ( caller(0) ) {
+  pod2usage(2) unless @ARGV;
+  migrate_file(@ARGV);
+};
+
+sub migrate_file {
+  my $file = shift or return;
+
+  my $contents = do { local( @ARGV, $/ ) = $file ; <> }
+    or die "cannot read file";
+
+  my %substitutions = (
+    "<translate>"  => "[% '",
+    "</translate>" => "' | \$T8 %]",
+  );
+
+  my $last_match = '';
+  my $num_matches;
+  my $in_template;
+  my $inline_counter = 0;
+
+  # now replace <translate> with [% '
+  # and </translate> with ' | $T8 %]
+  while ($contents =~ m# ( < /? translate> | \[% | %\] ) #xg) {
+    my $match  = $1;
+    my $pos    = pos $contents;
+
+    if ($match eq '[%') {
+      $in_template = 1;
+      DEBUG && warn "entering [% block %] at pos $pos";
+      next;
+    }
+    if ($match eq '%]') {
+      $in_template = 0;
+      DEBUG && warn "leaving [% block %] at pos $pos";
+      next;
+    }
+
+    if ($in_template) {
+      $inline_counter++ if $match eq '<translate>';
+      next;
+    }
+
+    DEBUG && warn "found token $match at pos $pos";
+
+    my $sub_by = $substitutions{$match};
+
+    unless ($sub_by) {
+      DEBUG && warn "found token $& but got no substitute";
+      next;
+    }
+
+    die "unbalanced tokens - two times '$match' in file $file"
+      if $last_match eq $match;
+
+    $last_match = $match;
+    $num_matches++;
+
+    # alter string. substr is faster than s/// for strings of this size.
+    substr $contents, $-[0], $+[0] - $-[0], $sub_by;
+
+    # set match pos for m//g matching on the altered string.
+    pos $contents = $-[0] + length $sub_by;
+  }
+
+  warn "found $inline_counter occurances of inline translates in file $file $/"
+    if $inline_counter;
+
+  exit 0 unless $num_matches;
+
+  die "unbalanced tokens in file $file" if $num_matches % 2;
+
+  if ($contents !~ m/\[%-? USE T8 %\]/) {
+    $contents = "[%- USE T8 %]$/" . $contents;
+  }
+
+  # all fine? spew back
+
+  do {
+    open my $fh, ">$file" or die "can't write $file $!";
+    print $fh $contents;
+  };
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+migrate_template_to_t8.pl - helper script to migrate templates to T8 module
+
+=head1 SYNOPSIS
+
+  # single:
+  scripts/migrate_template_to_t8.pl <file>
+
+  # bash:
+  for file in `find templates | grep master\.html`;
+    do scripts/migrate_template_to_t8.pl $file;
+  done;
+
+  # as a lib:
+  require "scripts/migrate_template_to_t8.pl";
+  migrate_file($file);
+
+=head1 DESCRIPTION
+
+This script will do the following actions in a template file
+
+=over 8
+
+=item 1.
+
+Change every occurance of C<<< <translate>Text</translate> >>> to C<<< [%
+'Text' | $T8 %] >>>
+
+=item 2.
+
+Add [%- USE T8 %] at the top if something needs to be translated
+
+=back
+
+Note! This script is written to help with the process of migrating old
+templates. It is assumed that anyone working on Lx-Office is working with a
+version control system. This script will change your files. You have been
+warned.
+
+Due to the nature of the previous locale system, it is not easily possible to
+migrate translates in other template blocks. As of this writing this is used in
+about 20 occurances throughout the code. If such a construct is found, a
+warning will be generated. lib uses of this will have to trap the warning.
+
+=head1 DIAGNOSIS
+
+=head2 found I<NUM> occurances of inline translates in file I<FILE>
+
+If a processed file has <translate> blocks in template blocks, these will be
+ignored.  This warning is thrown at the end of processing.
+
+=head2 unbalanced tokens in file I<FILE>
+
+The script could not resolve pairs of <translate> </translate>s. The file will
+not be changed in this case.
+
+=head1 AUTHOR
+
+Sven Schoeling E<lt>s.schoeling@linet-services.deE<gt>
+
+=cut
index becc6075d3899c37a90f485f91cbbcf2a19e0b45..403e18550504352287ba57deb765ae7d75334012 100644 (file)
@@ -33,13 +33,12 @@ use lib 't';
 
 use Support::Templates;
 
-# Bug 137589 - Disable command-line input of CGI.pm when testing
-use CGI qw(-no_debug);
-
 use File::Spec;
+use File::Slurp;
 use Template;
-use Test::More tests => ( scalar(@referenced_files) * scalar(@languages)
-                        + $num_actual_files  );
+use Test::More tests => ( scalar(@referenced_files));
+
+my $template_path = 'templates/webpages/';
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.
 # This will handle verbosity for us automatically.
@@ -55,98 +54,15 @@ my $fh;
     }
 }
 
-# Checks whether one of the passed files exists
-sub existOnce {
-  foreach my $file (@_) {
-    return $file  if -e $file;
-  }
-  return 0;
-}
-
-# Check to make sure all templates that are referenced in
-# Bugzilla exist in the proper place.
-
-foreach my $lang (@languages) {
-    foreach my $file (@referenced_files) {
-        my @path = map(File::Spec->catfile($_, $file),
-                       split(':', $include_path{$lang} . ":" . $include_path{"en"}));
-        if (my $path = existOnce(@path)) {
-            ok(1, "$path exists");
-        } else {
-            ok(0, "$file cannot be located --ERROR");
-            print $fh "Looked in:\n  " . join("\n  ", @path) . "\n";
-        }
-    }
-}
-
-foreach my $include_path (@include_paths) {
-    # Processes all the templates to make sure they have good syntax
-    my $provider = Template::Provider->new(
-    {
-        INCLUDE_PATH => $include_path ,
-        # Need to define filters used in the codebase, they don't
-        # actually have to function in this test, just be defined.
-        # See Template.pm for the actual codebase definitions.
-
-        # Initialize templates (f.e. by loading plugins like Hook).
-        PRE_PROCESS => "global/initialize.none.tmpl",
-
-        FILTERS =>
-        {
-            html_linebreak => sub { return $_; },
-            no_break => sub { return $_; } ,
-            js        => sub { return $_ } ,
-            base64   => sub { return $_ } ,
-            inactive => [ sub { return sub { return $_; } }, 1] ,
-            closed => [ sub { return sub { return $_; } }, 1] ,
-            obsolete => [ sub { return sub { return $_; } }, 1] ,
-            url_quote => sub { return $_ } ,
-            css_class_quote => sub { return $_ } ,
-            xml       => sub { return $_ } ,
-            quoteUrls => sub { return $_ } ,
-            bug_link => [ sub { return sub { return $_; } }, 1] ,
-            csv       => sub { return $_ } ,
-            unitconvert => sub { return $_ },
-            time      => sub { return $_ } ,
-            wrap_comment => sub { return $_ },
-            none      => sub { return $_ } ,
-            ics       => [ sub { return sub { return $_; } }, 1] ,
-        },
-    }
-    );
-
-    foreach my $file (@{$actual_files{$include_path}}) {
-        my $path = File::Spec->catfile($include_path, $file);
-        if (-e $path) {
-            my ($data, $err) = $provider->fetch($file);
-
-            if (!$err) {
-                ok(1, "$file syntax ok");
-            }
-            else {
-                ok(0, "$file has bad syntax --ERROR");
-                print $fh $data . "\n";
-            }
-        }
-        else {
-            ok(1, "$path doesn't exist, skipping test");
-        }
+# test master files for <translate> tag
+foreach my $ref (@Support::Templates::referenced_files) {
+    my $file = "${template_path}${ref}_master.html";
+    my $data = read_file($file) || die "??? couldn't open $file";
+    if ($data =~ /<translate>/) {
+        ok(0, "$file uses deprecated <translate> tags.");
+    } else {
+        ok(1, "$file does not use <translate> tags.");
     }
-
-    # check to see that all templates have a version string:
-    # disabled for lx-office
-
-#    foreach my $file (@{$actual_files{$include_path}}) {
-#        my $path = File::Spec->catfile($include_path, $file);
-#        open(TMPL, $path);
-#        my $firstline = <TMPL>;
-#        if ($firstline =~ /\d+\.\d+\@[\w\.-]+/) {
-#            ok(1,"$file has a version string");
-#        } else {
-#            ok(0,"$file does not have a version string --ERROR");
-#        }
-#        close(TMPL);
-#    }
 }
 
 exit 0;
diff --git a/templates/webpages/acctranscorrections/analyze_filter.html b/templates/webpages/acctranscorrections/analyze_filter.html
new file mode 100644 (file)
index 0000000..867bbad
--- /dev/null
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+ <p><div class="listheading">[% title %]</div></p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <form name="filter" method="post" action="acctranscorrections.pl">
+
+  <p>[% 'Time period for the analysis:' | $T8 %]</p>
+
+  <p>
+   <table>
+    <tr>
+     <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
+     <td><label for="scope_full">[% 'All general ledger entries' | $T8 %]</label></td>
+    </tr>
+
+    <tr>
+     <td><input type="radio" name="scope" id="scope_period" value="period"></td>
+     <td>
+      [% 'Period:' | $T8 %]
+      [% 'from (time)' | $T8 %]
+      <input name="transdate_from" id="transdate_from" size="10">
+      <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
+      [% 'to (time)' | $T8 %]
+      <input name="transdate_to" id="transdate_to" size="10">
+      <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" value="[% 'Start analysis' | $T8 %]">
+  </p>
+
+  <input type="hidden" name="action" value="analyze">
+ </form>
+
+ <script type="text/javascript">
+  <!--
+    Calendar.setup({ inputField : "transdate_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_from_trigger" });
+    Calendar.setup({ inputField : "transdate_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_to_trigger" });
+  //-->
+ </script>
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/analyze_filter_de.html b/templates/webpages/acctranscorrections/analyze_filter_de.html
deleted file mode 100644 (file)
index 9f5e942..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  Frühere Versionen von Lx-Office enthielten Bugs, die zu falschen Einträgen im Hauptbuch geführt haben können.
-  Diese Einträge können nicht automatisch bereinigt werden.
-  Dieses Modul kann Ihnen helfen, problematische Einträge im Hauptbuch zu identifizieren und teilweise zu beheben. Dabei werden je nach Problem mögliche Lösungen aufgezeigt, wobei Sie die entscheiden können, welche Probleme automatisch gelöst werden sollen.
- </p>
-
- <form name="filter" method="post" action="acctranscorrections.pl">
-
-  <p>Analysezeitraum:</p>
-
-  <p>
-   <table>
-    <tr>
-     <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
-     <td><label for="scope_full">Alle Hauptbucheinträge</label></td>
-    </tr>
-
-    <tr>
-     <td><input type="radio" name="scope" id="scope_period" value="period"></td>
-     <td>
-      Zeitraum:
-      von
-      <input name="transdate_from" id="transdate_from" size="10">
-      <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
-      bis
-      <input name="transdate_to" id="transdate_to" size="10">
-      <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" value="Analyse beginnen">
-  </p>
-
-  <input type="hidden" name="action" value="analyze">
- </form>
-
- <script type="text/javascript">
-  <!--
-    Calendar.setup({ inputField : "transdate_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_from_trigger" });
-    Calendar.setup({ inputField : "transdate_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_to_trigger" });
-  //-->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/analyze_filter_en.html b/templates/webpages/acctranscorrections/analyze_filter_en.html
deleted file mode 100644 (file)
index cc00a72..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.
-  These wrong entries cannot be fixed automatically.
-  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.
- </p>
-
- <form name="filter" method="post" action="acctranscorrections.pl">
-
-  <p>Time period for the analysis:</p>
-
-  <p>
-   <table>
-    <tr>
-     <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
-     <td><label for="scope_full">All general ledger entries</label></td>
-    </tr>
-
-    <tr>
-     <td><input type="radio" name="scope" id="scope_period" value="period"></td>
-     <td>
-      Period:
-      from (time)
-      <input name="transdate_from" id="transdate_from" size="10">
-      <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
-      to (time)
-      <input name="transdate_to" id="transdate_to" size="10">
-      <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" value="Start analysis">
-  </p>
-
-  <input type="hidden" name="action" value="analyze">
- </form>
-
- <script type="text/javascript">
-  <!--
-    Calendar.setup({ inputField : "transdate_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_from_trigger" });
-    Calendar.setup({ inputField : "transdate_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_to_trigger" });
-  //-->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/analyze_filter_master.html b/templates/webpages/acctranscorrections/analyze_filter_master.html
deleted file mode 100644 (file)
index 12ce062..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-[% USE HTML %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  <translate>Earlier versions of Lx-Office contained bugs which might
-   have led to wrong entries in the general ledger.</translate>
-  <translate>These wrong entries cannot be fixed
-   automatically.</translate>
-  <translate>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.</translate>
- </p>
-
- <form name="filter" method="post" action="acctranscorrections.pl">
-
-  <p><translate>Time period for the analysis:</translate></p>
-
-  <p>
-   <table>
-    <tr>
-     <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
-     <td><label for="scope_full"><translate>All general ledger entries</translate></label></td>
-    </tr>
-
-    <tr>
-     <td><input type="radio" name="scope" id="scope_period" value="period"></td>
-     <td>
-      <translate>Period:</translate>
-      <translate>from (time)</translate>
-      <input name="transdate_from" id="transdate_from" size="10">
-      <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
-      <translate>to (time)</translate>
-      <input name="transdate_to" id="transdate_to" size="10">
-      <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" value="<translate>Start analysis</translate>">
-  </p>
-
-  <input type="hidden" name="action" value="analyze">
- </form>
-
- <script type="text/javascript">
-  <!--
-    Calendar.setup({ inputField : "transdate_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_from_trigger" });
-    Calendar.setup({ inputField : "transdate_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_to_trigger" });
-  //-->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/analyze_overview.html b/templates/webpages/acctranscorrections/analyze_overview.html
new file mode 100644 (file)
index 0000000..883c4e7
--- /dev/null
@@ -0,0 +1,159 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]</p>
+
+ <p>
+  [% 'Period' | $T8 %]:
+  [%- IF transdate_from || transdate_to %]
+   [%- IF transdate_from %]
+   [% 'from (time)' | $T8 %] [% transdate_from %]
+   [%- END %]
+   [%- IF transdate_to %]
+   [% 'to (time)' | $T8 %] [% transdate_to %]
+   [%- END %]
+  [%- ELSE %]
+  [% 'all entries' | $T8 %]
+  [%- END %]
+ </p>
+
+ <p>
+  <table width="100%">
+   <tr>
+    <th class="listheading">[% 'Transaction' | $T8 %]</th>
+    <th class="listheading">[% 'Problem' | $T8 %]</th>
+    <th class="listheading">[% 'Solution' | $T8 %]</th>
+   </tr>
+
+   [%- FOREACH problem = PROBLEMS %]
+   <tr class="listrow[% loop.count % 2 %]">
+    <td valign="top">
+     [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
+      [%- IF problem.ap_problems.size %]
+       [% 'AP Transactions' | $T8 %]
+       [%- FOREACH ap = problem.ap_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+      [%- IF problem.ar_problems.size %]
+       [%- IF problem.ap_problems.size %]; [%- END %]
+       [% 'AR Transactions' | $T8 %]
+       [%- FOREACH ar = problem.ar_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+
+     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+      [%- IF problem.ar_problems.size %]
+       [% 'Sales invoices' | $T8 %]
+       [%- FOREACH subproblem = problem.ar_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+      [%- IF problem.ap_problems.size %]
+       [%- IF problem.ar_problems.size %]; [%- END %]
+       [% 'Purchase invoices' | $T8 %]
+       [%- FOREACH subproblem = problem.ap_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
+      [%- IF problem.ar_problems.size %]
+       [% 'Sales invoices' | $T8 %]
+       [%- FOREACH subproblem = problem.ar_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+      [%- IF problem.ap_problems.size %]
+       [%- IF problem.ar_problems.size %]; [%- END %]
+       [% 'Purchase invoices' | $T8 %]
+       [%- FOREACH subproblem = problem.ap_problems %]
+        [%- UNLESS loop.first %], [%- END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [%- END %]
+      [%- END %]
+
+     [%- ELSE %]
+
+     <a href="[% problem.link %]">
+      [%- IF problem.data.module == 'ar' %]
+      [% 'AR Transaction' | $T8 %]
+      [%- ELSIF problem.data.module == 'ap' %]
+      [% 'AP Transaction' | $T8 %]
+      [%- ELSE %]
+      [% 'General Ledger Transaction' | $T8 %]
+      [%- END %]
+      [% HTML.escape(problem.data.reference) %]
+     </a>
+
+      <!-- ( [% problem.data.module %].id = acc_trans.trans_id = [% HTML.escape(problem.data.trans_id) %] ) -->
+
+     [%- END %]
+    </td>
+
+    <td valign="top">
+     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
+     [% 'Transaction has been split on both the credit and the debit side' | $T8 %]
+
+     [%- ELSIF problem.type == 'wrong_taxkeys' %]
+     [% 'Wrong tax keys recorded' | $T8 %]
+
+     [%- ELSIF problem.type == 'wrong_taxes' %]
+     [% 'Wrong taxes recorded' | $T8 %]
+
+     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
+     [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %]
+
+     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+     [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %]
+
+     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
+     [% 'Missing taxkeys in invoices with taxes.' | $T8 %]
+
+     [%- END %]
+    </td>
+
+    <td valign="top">
+     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
+     [% 'This transaction has to be split into several transactions manually.' | $T8 %]
+
+     [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
+     <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
+     <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+     <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [%- END %]
+    </td>
+   </tr>
+   [%- END %]
+
+  </table>
+ </p>
+
+ <hr>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/analyze_overview_de.html b/templates/webpages/acctranscorrections/analyze_overview_de.html
deleted file mode 100644 (file)
index 99eb3db..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.</p>
-
- <p>
-  Zeitraum:
-  [%- IF transdate_from || transdate_to %]
-   [%- IF transdate_from %]
-   von [% transdate_from %]
-   [%- END %]
-   [%- IF transdate_to %]
-   bis [% transdate_to %]
-   [%- END %]
-  [%- ELSE %]
-  alle Einträge
-  [%- END %]
- </p>
-
- <p>
-  <table width="100%">
-   <tr>
-    <th class="listheading">Buchung</th>
-    <th class="listheading">Problem</th>
-    <th class="listheading">Lösung</th>
-   </tr>
-
-   [%- FOREACH problem = PROBLEMS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td valign="top">
-     [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
-      [%- IF problem.ap_problems.size %]
-       Kreditorenbuchungen
-       [%- FOREACH ap = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ar_problems.size %]
-       [%- IF problem.ap_problems.size %]; [%- END %]
-       Debitorenbuchungen
-       [%- FOREACH ar = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-      [%- IF problem.ar_problems.size %]
-       Verkaufsrechnungen
-       [%- FOREACH subproblem = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ap_problems.size %]
-       [%- IF problem.ar_problems.size %]; [%- END %]
-       Einkaufsrechnungen
-       [%- FOREACH subproblem = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-      [%- IF problem.ar_problems.size %]
-       Verkaufsrechnungen
-       [%- FOREACH subproblem = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ap_problems.size %]
-       [%- IF problem.ar_problems.size %]; [%- END %]
-       Einkaufsrechnungen
-       [%- FOREACH subproblem = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-     [%- ELSE %]
-
-     <a href="[% problem.link %]">
-      [%- IF problem.data.module == 'ar' %]
-      Debitorenbuchung
-      [%- ELSIF problem.data.module == 'ap' %]
-      Kreditorenbuchung
-      [%- ELSE %]
-      Dialogbuchung
-      [%- END %]
-      [% HTML.escape(problem.data.reference) %]
-     </a>
-
-      <!-- ( [% problem.data.module %].id = acc_trans.trans_id = [% HTML.escape(problem.data.trans_id) %] ) -->
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     Sowohl auf der Soll- als auch auf der Haben-Seite gesplittete Buchung
-
-     [%- ELSIF problem.type == 'wrong_taxkeys' %]
-     Gespeicherte Steuerschlüssel sind falsch
-
-     [%- ELSIF problem.type == 'wrong_taxes' %]
-     Gespeicherte Steuern passen nicht zum Steuerschlüssel
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     Kreditorenbuchungen mit Umsatzsteuer-Steuerschlüsseln und/oder Debitorenbuchungen mit Vorsteuer-Steuerschlüsseln
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     Einkaufs- und Verkaufsrechnungen mit Warenbestandsbuchungen mit Steuerschlüsseln
-
-     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-     Fehlende Steuerschl&uuml;ssel in Rechnungen mit Steuern
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     Diese Buchung muss manuell in mehrere Buchungen aufgeteilt werden.
-
-     [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
-     <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
-      Korrekturassistenten starten
-     </a>
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
-      Korrekturassistenten starten
-     </a>
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
-      Korrekturassistenten starten
-     </a>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-
-  </table>
- </p>
-
- <hr>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/analyze_overview_en.html b/templates/webpages/acctranscorrections/analyze_overview_en.html
deleted file mode 100644 (file)
index 47cd963..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>Lx-Office has found one or more problems in the general ledger.</p>
-
- <p>
-  Period:
-  [%- IF transdate_from || transdate_to %]
-   [%- IF transdate_from %]
-   from (time) [% transdate_from %]
-   [%- END %]
-   [%- IF transdate_to %]
-   to (time) [% transdate_to %]
-   [%- END %]
-  [%- ELSE %]
-  all entries
-  [%- END %]
- </p>
-
- <p>
-  <table width="100%">
-   <tr>
-    <th class="listheading">Transaction</th>
-    <th class="listheading">Problem</th>
-    <th class="listheading">Solution</th>
-   </tr>
-
-   [%- FOREACH problem = PROBLEMS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td valign="top">
-     [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
-      [%- IF problem.ap_problems.size %]
-       Purchase Transactions
-       [%- FOREACH ap = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ar_problems.size %]
-       [%- IF problem.ap_problems.size %]; [%- END %]
-       Sales Transactions
-       [%- FOREACH ar = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-      [%- IF problem.ar_problems.size %]
-       Sales invoices
-       [%- FOREACH subproblem = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ap_problems.size %]
-       [%- IF problem.ar_problems.size %]; [%- END %]
-       Purchase invoices
-       [%- FOREACH subproblem = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-     [%- ELSE %]
-
-     <a href="[% problem.link %]">
-      [%- IF problem.data.module == 'ar' %]
-      Sales Transaction
-      [%- ELSIF problem.data.module == 'ap' %]
-      Purchase Transaction
-      [%- ELSE %]
-      General Ledger Transaction
-      [%- END %]
-      [% HTML.escape(problem.data.reference) %]
-     </a>
-
-      <!-- ( [% problem.data.module %].id = acc_trans.trans_id = [% HTML.escape(problem.data.trans_id) %] ) -->
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     Transaction has been split on both the credit and the debit side
-
-     [%- ELSIF problem.type == 'wrong_taxkeys' %]
-     Wrong tax keys recorded
-
-     [%- ELSIF problem.type == 'wrong_taxes' %]
-     Wrong taxes recorded
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     AP transactions with sales taxkeys and/or AR transactions with input taxkeys
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     Sales and purchase invoices with inventory transactions with taxkeys
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     This transaction has to be split into several transactions manually.
-
-     [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
-     <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
-      Start the correction assistant
-     </a>
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
-      Start the correction assistant
-     </a>
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
-      Start the correction assistant
-     </a>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-
-  </table>
- </p>
-
- <hr>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/analyze_overview_master.html b/templates/webpages/acctranscorrections/analyze_overview_master.html
deleted file mode 100644 (file)
index 408bc04..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p><translate>Lx-Office has found one or more problems in the general ledger.</translate></p>
-
- <p>
-  <translate>Period</translate>:
-  [%- IF transdate_from || transdate_to %]
-   [%- IF transdate_from %]
-   <translate>from (time)</translate> [% transdate_from %]
-   [%- END %]
-   [%- IF transdate_to %]
-   <translate>to (time)</translate> [% transdate_to %]
-   [%- END %]
-  [%- ELSE %]
-  <translate>all entries</translate>
-  [%- END %]
- </p>
-
- <p>
-  <table width="100%">
-   <tr>
-    <th class="listheading"><translate>Transaction</translate></th>
-    <th class="listheading"><translate>Problem</translate></th>
-    <th class="listheading"><translate>Solution</translate></th>
-   </tr>
-
-   [%- FOREACH problem = PROBLEMS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td valign="top">
-     [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
-      [%- IF problem.ap_problems.size %]
-       <translate>AP Transactions</translate>
-       [%- FOREACH ap = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ar_problems.size %]
-       [%- IF problem.ap_problems.size %]; [%- END %]
-       <translate>AR Transactions</translate>
-       [%- FOREACH ar = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-      [%- IF problem.ar_problems.size %]
-       <translate>Sales invoices</translate>
-       [%- FOREACH subproblem = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ap_problems.size %]
-       [%- IF problem.ar_problems.size %]; [%- END %]
-       <translate>Purchase invoices</translate>
-       [%- FOREACH subproblem = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-      [%- IF problem.ar_problems.size %]
-       <translate>Sales invoices</translate>
-       [%- FOREACH subproblem = problem.ar_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-      [%- IF problem.ap_problems.size %]
-       [%- IF problem.ar_problems.size %]; [%- END %]
-       <translate>Purchase invoices</translate>
-       [%- FOREACH subproblem = problem.ap_problems %]
-        [%- UNLESS loop.first %], [%- END %]
-        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
-       [%- END %]
-      [%- END %]
-
-     [%- ELSE %]
-
-     <a href="[% problem.link %]">
-      [%- IF problem.data.module == 'ar' %]
-      <translate>AR Transaction</translate>
-      [%- ELSIF problem.data.module == 'ap' %]
-      <translate>AP Transaction</translate>
-      [%- ELSE %]
-      <translate>General Ledger Transaction</translate>
-      [%- END %]
-      [% HTML.escape(problem.data.reference) %]
-     </a>
-
-      <!-- ( [% problem.data.module %].id = acc_trans.trans_id = [% HTML.escape(problem.data.trans_id) %] ) -->
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     <translate>Transaction has been split on both the credit and the debit side</translate>
-
-     [%- ELSIF problem.type == 'wrong_taxkeys' %]
-     <translate>Wrong tax keys recorded</translate>
-
-     [%- ELSIF problem.type == 'wrong_taxes' %]
-     <translate>Wrong taxes recorded</translate>
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     <translate>AP transactions with sales taxkeys and/or AR transactions with input taxkeys</translate>
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     <translate>Sales and purchase invoices with inventory transactions with taxkeys</translate>
-
-     [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-     <translate>Missing taxkeys in invoices with taxes.</translate>
-
-     [%- END %]
-    </td>
-
-    <td valign="top">
-     [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     <translate>This transaction has to be split into several transactions manually.</translate>
-
-     [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
-     <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
-     </a>
-
-     [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
-     </a>
-
-     [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
-     </a>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-
-  </table>
- </p>
-
- <hr>
-
-</body>
-</html>
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 (file)
index 0000000..6115d92
--- /dev/null
@@ -0,0 +1,32 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %]
+
+  [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %]
+ </p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <form name="Form" action="acctranscorrections.pl" method="post">
+
+  <p>
+   <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html
deleted file mode 100644 (file)
index f97c055..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Es gibt mindestens eine Buchung, bei der ein logisch nicht passender Steuerschlüssel ausgewählt wurde.
-
-  Das bedeutet, dass ein Benutzer eine Kreditorenbuchung angelegt und in ihr einen Umsatzsteuer-Steuerschlüssel verwendet oder eine Debitorenbuchung mit Vorsteuer-Steuerschlüssel angelegt hat.
- </p>
-
- <p>
-  Lx-Office kann solche Probleme automatisch beheben.
-
-  Bei Kreditorenbuchungen werden die Umsatzsteuer-Steuerschlüssel durch Vorsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.
-
-  Bei Debitorenbuchungen werden die Vorsteuer-Steuerschlüssel durch Umsatzsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Buchungen korrigieren">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_en.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_en.html
deleted file mode 100644 (file)
index aa62120..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  There is at least one transaction for which the user has chosen a logically wrong taxkey.
-
-  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.
- </p>
-
- <p>
-  Lx-Office can fix these problems automatically.
-
-  For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.
-
-  For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Fix transactions">
-   <input type="button" class="submit" onclick="history.back()" value="Back">
-  </p>
- </form>
-
-</body>
-</html>
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 (file)
index a310aa9..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>There is at least one transaction for which the user has
-   chosen a logically wrong taxkey.</translate>
-
-  <translate>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.</translate>
- </p>
-
- <p>
-  <translate>Lx-Office can fix these problems automatically.</translate>
-
-  <translate>For AP transactions it will replace the sales taxkeys
-   with input taxkeys with the same tax rate.</translate>
-
-  <translate>For AR transactions it will replace the input taxkeys
-   with sales taxkeys with the same tax rate.</translate>
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="<translate>Fix transactions</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-
-</body>
-</html>
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 (file)
index 0000000..a0fa658
--- /dev/null
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <form name="Form" action="acctranscorrections.pl" method="post">
+
+  <p>
+   <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html
deleted file mode 100644 (file)
index 0a29b51..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Es gibt mindestens eine Einkaufs- oder Verkaufsrechnung, für die Lx-Office einen Steuerschlüssel ungleich 0 verzeichnet hat, obwohl für Warenbestandsbuchugen bei Rechnungen nie Steuern gebucht werden.
- </p>
-
- <p>
-  Lx-Office kann solche Probleme automatisch beheben.
-
-  Es wird einfach die Steuerschlüssel auf  0 setzen, was "keine Steuer" bedeutet und für solche Warenbestandsbuchungen der richtige Wert ist.
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Buchungen korrigieren">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_en.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_en.html
deleted file mode 100644 (file)
index 502c281..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  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.
- </p>
-
- <p>
-  Lx-Office can fix these problems automatically.
-
-  It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Fix transactions">
-   <input type="button" class="submit" onclick="history.back()" value="Back">
-  </p>
- </form>
-
-</body>
-</html>
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 (file)
index 32ada42..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>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.</translate>
- </p>
-
- <p>
-  <translate>Lx-Office can fix these problems automatically.</translate>
-
-  <translate>It will simply set the taxkey to 0 (meaning "no taxes")
-   which is the correct value for such inventory
-   transactions.</translate>
- </p>
-
- <form name="Form" action="acctranscorrections.pl" method="post">
-
-  <p>
-   <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="<translate>Fix transactions</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html
new file mode 100644 (file)
index 0000000..1195f28
--- /dev/null
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The following transaction contains wrong taxes:' | $T8 %]
+  <a href="[% problem.link %]">
+   [%- IF problem.data.module == 'ar' %]
+   [% 'AR Transaction' | $T8 %]
+   [%- ELSIF problem.data.module == 'ap' %]
+   [% 'AP Transaction' | $T8 %]
+   [%- ELSE %]
+   [% 'General Ledger Transaction' | $T8 %]
+   [%- END %]
+   [% HTML.escape(problem.data.reference) %]
+  </a>
+ </p>
+
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
+
+ <p>
+  <table>
+   <tr>
+    <th class="listheading">[% 'Account' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Taxkey' | $T8 %]</th>
+    <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+    <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
+    <th class="listheading"></th>
+   </tr>
+
+   [%- 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 %]
+     <tr class="listrow[% curr_row % 2 %]">
+      <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
+      <td align="right">
+       [%- IF idx == 'debit' %]
+        [% LxERP.format_amount(row.display_amount, 2) %]
+       [%- END %]
+      </td>
+      <td align="right">
+       [%- IF idx == 'credit' %]
+        [% LxERP.format_amount(row.display_amount, 2) %]
+       [%- END %]
+      </td>
+      <td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td>
+      <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td>
+      <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td>
+      <td align="center" valign="center"><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td>
+     </tr>
+    [%- END %]
+   [%- END %]
+
+  </table>
+ </p>
+ <hr>
+
+ <form method="post" action="acctranscorrections.pl">
+  <p>
+   <input type="hidden" name="action" value="delete_transaction">
+   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
+   <input type="submit" class="submit" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html
deleted file mode 100644 (file)
index 8b045cb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Die folgende Buchung enthält falsche Steuern:
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   Debitorenbuchung
-   [%- ELSIF problem.data.module == 'ap' %]
-   Kreditorenbuchung
-   [%- ELSE %]
-   Dialogbuchung
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p>Aktuell sieht die Buchung wie folgt aus:</p>
-
- <p>
-  <table>
-   <tr>
-    <th class="listheading">Konto</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Steuerschlüssel</th>
-    <th class="listheading">Gespeicherte Steuern</th>
-    <th class="listheading">Erwartete Steuern</th>
-    <th class="listheading"></th>
-   </tr>
-
-   [%- 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 %]
-     <tr class="listrow[% curr_row % 2 %]">
-      <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-      <td align="right">
-       [%- IF idx == 'debit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td align="right">
-       [%- IF idx == 'credit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td>
-      <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td>
-      <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td>
-      <td align="center" valign="center"><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td>
-     </tr>
-    [%- END %]
-   [%- END %]
-
-  </table>
- </p>
- <hr>
-
- <form method="post" action="acctranscorrections.pl">
-  <p>
-   <input type="hidden" name="action" value="delete_transaction">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="submit" class="submit" value="Buchung löschen">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_en.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_en.html
deleted file mode 100644 (file)
index e9cb8ea..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The following transaction contains wrong taxes:
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   Sales Transaction
-   [%- ELSIF problem.data.module == 'ap' %]
-   Purchase Transaction
-   [%- ELSE %]
-   General Ledger Transaction
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p>At the moment the transaction looks like this:</p>
-
- <p>
-  <table>
-   <tr>
-    <th class="listheading">Account</th>
-    <th class="listheading">Debit</th>
-    <th class="listheading">Credit</th>
-    <th class="listheading">Taxkey</th>
-    <th class="listheading">Recorded Tax</th>
-    <th class="listheading">Expected Tax</th>
-    <th class="listheading"></th>
-   </tr>
-
-   [%- 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 %]
-     <tr class="listrow[% curr_row % 2 %]">
-      <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-      <td align="right">
-       [%- IF idx == 'debit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td align="right">
-       [%- IF idx == 'credit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td>
-      <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td>
-      <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td>
-      <td align="center" valign="center"><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td>
-     </tr>
-    [%- END %]
-   [%- END %]
-
-  </table>
- </p>
- <hr>
-
- <form method="post" action="acctranscorrections.pl">
-  <p>
-   <input type="hidden" name="action" value="delete_transaction">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="submit" class="submit" value="Delete transaction">
-   <input type="button" class="submit" onclick="history.back()" value="Back">
-  </p>
- </form>
-
-</body>
-</html>
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 (file)
index f35960d..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The following transaction contains wrong taxes:</translate>
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   <translate>AR Transaction</translate>
-   [%- ELSIF problem.data.module == 'ap' %]
-   <translate>AP Transaction</translate>
-   [%- ELSE %]
-   <translate>General Ledger Transaction</translate>
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p><translate>At the moment the transaction looks like this:</translate></p>
-
- <p>
-  <table>
-   <tr>
-    <th class="listheading"><translate>Account</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Taxkey</translate></th>
-    <th class="listheading"><translate>Recorded Tax</translate></th>
-    <th class="listheading"><translate>Expected Tax</translate></th>
-    <th class="listheading"></th>
-   </tr>
-
-   [%- 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 %]
-     <tr class="listrow[% curr_row % 2 %]">
-      <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-      <td align="right">
-       [%- IF idx == 'debit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td align="right">
-       [%- IF idx == 'credit' %]
-        [% LxERP.format_amount(row.display_amount, 2) %]
-       [%- END %]
-      </td>
-      <td>[% IF idx != other_side %][% HTML.escape(row.taxdescription) %][% END %]</td>
-      <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.actual_tax, 2) %][% END %]</td>
-      <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.expected_tax, 2) %][% END %]</td>
-      <td align="center" valign="center"><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td>
-     </tr>
-    [%- END %]
-   [%- END %]
-
-  </table>
- </p>
- <hr>
-
- <form method="post" action="acctranscorrections.pl">
-  <p>
-   <input type="hidden" name="action" value="delete_transaction">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="submit" class="submit" value="<translate>Delete transaction</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
new file mode 100644 (file)
index 0000000..430f0fc
--- /dev/null
@@ -0,0 +1,146 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The following transaction contains wrong taxkeys:' | $T8 %]
+  <a href="[% problem.link %]">
+   [%- IF problem.data.module == 'ar' %]
+   [% 'AR Transaction' | $T8 %]
+   [%- ELSIF problem.data.module == 'ap' %]
+   [% 'AP Transaction' | $T8 %]
+   [%- ELSE %]
+   [% 'General Ledger Transaction' | $T8 %]
+   [%- END %]
+   [% HTML.escape(problem.data.reference) %]
+  </a>
+ </p>
+
+ <p>
+  [% 'This could have happened for two reasons:' | $T8 %]
+
+  [% 'The first reason is that 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 %]
+ </p>
+
+ <p>
+  [% 'The transaction is shown below in its current state.' | $T8 %]
+
+  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
+
+  [%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
+ </p>
+
+ <p>
+  [% 'You can also delete this transaction and re-enter it manually.' | $T8 %]
+
+  [% 'In order to do that hit the button "Delete transaction".' | $T8 %]
+ </p>
+
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
+
+ <form method="post" action="acctranscorrections.pl" name="Form">
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Account' | $T8 %]</th>
+     <th class="listheading">[% 'Debit' | $T8 %]</th>
+     <th class="listheading">[% 'Credit' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded taxkey' | $T8 %]</th>
+     <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
+     <th class="listheading"></th>
+     <th class="listheading">[% 'Correct taxkey' | $T8 %]</th>
+    </tr>
+
+    [%- SET curr_row = 0 %]
+    [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
+     [%- SET order = [ 'credit', 'debit' ] %]
+     [%- SET other_side = 'debit' %]
+    [%- ELSE %]
+     [%- SET order = [ 'debit', 'credit' ] %]
+     [%- SET other_side = 'credit' %]
+    [%- END %]
+
+
+    [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
+    [%- ELSE %]
+    [%- END %]
+
+
+    [%- FOREACH idx = order %]
+     [%- FOREACH row = problem.acc_trans.$idx.entries %]
+      [%- SET curr_row = curr_row + 1 %]
+      <tr class="listrow[% curr_row % 2 %]">
+       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
+       <td align="right">
+        [%- IF idx == 'debit' %]
+         [% LxERP.format_amount(row.display_amount, 2) %]
+        [%- END %]
+       </td>
+       <td align="right">
+        [%- IF idx == 'credit' %]
+         [% LxERP.format_amount(row.display_amount, 2) %]
+        [%- END %]
+       </td>
+       <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
+       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
+       <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
+       <td align="center" valign="center"><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
+
+       <td>
+        [%- IF row.taxkey_error %]
+         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
+         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
+         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
+          <option value="">[% '---please select---' | $T8 %]</option>
+          [%- FOREACH taxkey = row.correct_taxkeys %]
+           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
+          [%- END %]
+        [%- ELSE %]
+        &nbsp;
+        [%- END %]
+      </tr>
+     [%- END %]
+    [%- END %]
+
+   </table>
+  </p>
+  <hr>
+
+  <p>
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+   <input type="hidden" name="action" value="dispatcher">
+   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
+   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
+   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
+   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
+   <input type="submit" class="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <script type="text/javascript">
+  <!--
+    function enable_fix_button_maybe() {
+      var all_set = true;
+      $("[name='fixes[].taxkey']").each(function () {
+        var val = $(this).attr('value');
+        if (val == '')
+          all_set = false;
+      });
+
+      $("#fix_transaction_button").attr('disabled', !all_set);
+    }
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html
deleted file mode 100644 (file)
index 611f76e..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Die folgende Buchung enthält falsche Steuerschlüssel:
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   Debitorenbuchung
-   [%- ELSIF problem.data.module == 'ap' %]
-   Kreditorenbuchung
-   [%- ELSE %]
-   Dialogbuchung
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p>
-  Dies kann aus zwei Gründen geschehen sein:
-
-  Zum Einen gab es einen Bug in Lx-Office, der dazu führte, dass bei Buchungen mit verschiedenen Steuerschlüssel auf ein Konto teilweise falsche Steuerschlüssel gespeichert wurden.
-
-  Zum Anderen war es möglich, die Steuern unabhängig vom ausgewählten Steuerschlüssel selber einzugeben.
-
-  Solche Einträge sind aber nicht DATEV-exportiertbar und müssen ebenfalls korrigiert werden.
- </p>
-
- <p>
-  Nachfolgend wird angezeigt, wie die Buchung momentan aussieht.
-
-  Sie haben die Möglichkeit, die Buchung zu korrigieren, indem Sie in den Drop-Down-Boxen die richtigen Steuerschlüssel auswählen und anschließend auf den Button "Buchung korrigieren" drücken.
-
-  Auch nach einer Korrektur kann es mit dieser Buchung noch weitere Probleme geben (z.B. nicht zum Steuerschlüssel passende Steuern), weshalb ein erneutes Ausführen der Hauptbuchanalyse empfohlen wird.
- </p>
-
- <p>
-  Alternativ können Sie die Buchung auch mit löschen lassen und sie anschließend neu eingeben.
-
-  Drücken Sie dafür auf den Button "Buchung löschen".
- </p>
-
- <p>Aktuell sieht die Buchung wie folgt aus:</p>
-
- <form method="post" action="acctranscorrections.pl" name="Form">
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Konto</th>
-     <th class="listheading">Soll</th>
-     <th class="listheading">Haben</th>
-     <th class="listheading">Gespeicherte Steuern</th>
-     <th class="listheading">Gespeicherter Steuerschlüssel</th>
-     <th class="listheading">Erwartete Steuern</th>
-     <th class="listheading"></th>
-     <th class="listheading">Richtiger Steuerschlüssel</th>
-    </tr>
-
-    [%- SET curr_row = 0 %]
-    [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
-     [%- SET order = [ 'credit', 'debit' ] %]
-     [%- SET other_side = 'debit' %]
-    [%- ELSE %]
-     [%- SET order = [ 'debit', 'credit' ] %]
-     [%- SET other_side = 'credit' %]
-    [%- END %]
-
-
-    [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
-    [%- ELSE %]
-    [%- END %]
-
-
-    [%- FOREACH idx = order %]
-     [%- FOREACH row = problem.acc_trans.$idx.entries %]
-      [%- SET curr_row = curr_row + 1 %]
-      <tr class="listrow[% curr_row % 2 %]">
-       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-       <td align="right">
-        [%- IF idx == 'debit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">
-        [%- IF idx == 'credit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
-       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
-       <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
-       <td align="center" valign="center"><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
-
-       <td>
-        [%- IF row.taxkey_error %]
-         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
-         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
-         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
-          <option value="">---bitte auswählen---</option>
-          [%- FOREACH taxkey = row.correct_taxkeys %]
-           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
-          [%- END %]
-        [%- ELSE %]
-        &nbsp;
-        [%- END %]
-      </tr>
-     [%- END %]
-    [%- END %]
-
-   </table>
-  </p>
-  <hr>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
-   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="Buchung korrigieren" disabled>
-   <input type="submit" class="submit" name="action_delete_transaction" value="Buchung löschen">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    function enable_fix_button_maybe() {
-      var all_set = true;
-      $("[name='fixes[].taxkey']").each(function () {
-        var val = $(this).attr('value');
-        if (val == '')
-          all_set = false;
-      });
-
-      $("#fix_transaction_button").attr('disabled', !all_set);
-    }
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_en.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_en.html
deleted file mode 100644 (file)
index e89cd82..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The following transaction contains wrong taxkeys:
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   Sales Transaction
-   [%- ELSIF problem.data.module == 'ap' %]
-   Purchase Transaction
-   [%- ELSE %]
-   General Ledger Transaction
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p>
-  This could have happened for two reasons:
-
-  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.
-
-  The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.
-
-  Such entries cannot be exported into the DATEV format and have to be fixed as well.
- </p>
-
- <p>
-  The transaction is shown below in its current state.
-
-  You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.
-
-  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.
- </p>
-
- <p>
-  You can also delete this transaction and re-enter it manually.
-
-  In order to do that hit the button "Delete transaction".
- </p>
-
- <p>At the moment the transaction looks like this:</p>
-
- <form method="post" action="acctranscorrections.pl" name="Form">
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Account</th>
-     <th class="listheading">Debit</th>
-     <th class="listheading">Credit</th>
-     <th class="listheading">Recorded Tax</th>
-     <th class="listheading">Recorded taxkey</th>
-     <th class="listheading">Expected Tax</th>
-     <th class="listheading"></th>
-     <th class="listheading">Correct taxkey</th>
-    </tr>
-
-    [%- SET curr_row = 0 %]
-    [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
-     [%- SET order = [ 'credit', 'debit' ] %]
-     [%- SET other_side = 'debit' %]
-    [%- ELSE %]
-     [%- SET order = [ 'debit', 'credit' ] %]
-     [%- SET other_side = 'credit' %]
-    [%- END %]
-
-
-    [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
-    [%- ELSE %]
-    [%- END %]
-
-
-    [%- FOREACH idx = order %]
-     [%- FOREACH row = problem.acc_trans.$idx.entries %]
-      [%- SET curr_row = curr_row + 1 %]
-      <tr class="listrow[% curr_row % 2 %]">
-       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-       <td align="right">
-        [%- IF idx == 'debit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">
-        [%- IF idx == 'credit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
-       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
-       <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
-       <td align="center" valign="center"><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
-
-       <td>
-        [%- IF row.taxkey_error %]
-         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
-         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
-         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
-          <option value="">---please select---</option>
-          [%- FOREACH taxkey = row.correct_taxkeys %]
-           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
-          [%- END %]
-        [%- ELSE %]
-        &nbsp;
-        [%- END %]
-      </tr>
-     [%- END %]
-    [%- END %]
-
-   </table>
-  </p>
-  <hr>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
-   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="Fix transaction" disabled>
-   <input type="submit" class="submit" name="action_delete_transaction" value="Delete transaction">
-   <input type="button" class="submit" onclick="history.back()" value="Back">
-  </p>
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    function enable_fix_button_maybe() {
-      var all_set = true;
-      $("[@name='fixes[].taxkey']").each(function () {
-        var val = $(this).attr('value');
-        if (val == '')
-          all_set = false;
-      });
-
-      $("#fix_transaction_button").attr('disabled', !all_set);
-    }
-    -->
- </script>
-
-</body>
-</html>
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 (file)
index 44fb603..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The following transaction contains wrong taxkeys:</translate>
-  <a href="[% problem.link %]">
-   [%- IF problem.data.module == 'ar' %]
-   <translate>AR Transaction</translate>
-   [%- ELSIF problem.data.module == 'ap' %]
-   <translate>AP Transaction</translate>
-   [%- ELSE %]
-   <translate>General Ledger Transaction</translate>
-   [%- END %]
-   [% HTML.escape(problem.data.reference) %]
-  </a>
- </p>
-
- <p>
-  <translate>This could have happened for two reasons:</translate>
-
-  <translate>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.</translate>
-
-  <translate>The second reason is that Lx-Office allowed the user to
-  enter the tax amount manually regardless of the taxkey
-  used.</translate>
-
-  <translate>Such entries cannot be exported into the DATEV format and
-   have to be fixed as well.</translate>
- </p>
-
- <p>
-  <translate>The transaction is shown below in its current state.</translate>
-
-  <translate>You can correct this transaction by chosing the correct
-   taxkeys from the drop down boxes and hitting the button "Fix
-   transaction" afterwards.</translate>
-
-  <translate>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.</translate>
- </p>
-
- <p>
-  <translate>You can also delete this transaction and re-enter it
-   manually.</translate>
-
-  <translate>In order to do that hit the button "Delete
-   transaction".</translate>
- </p>
-
- <p><translate>At the moment the transaction looks like this:</translate></p>
-
- <form method="post" action="acctranscorrections.pl" name="Form">
-  <p>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Account</translate></th>
-     <th class="listheading"><translate>Debit</translate></th>
-     <th class="listheading"><translate>Credit</translate></th>
-     <th class="listheading"><translate>Recorded Tax</translate></th>
-     <th class="listheading"><translate>Recorded taxkey</translate></th>
-     <th class="listheading"><translate>Expected Tax</translate></th>
-     <th class="listheading"></th>
-     <th class="listheading"><translate>Correct taxkey</translate></th>
-    </tr>
-
-    [%- SET curr_row = 0 %]
-    [%- IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
-     [%- SET order = [ 'credit', 'debit' ] %]
-     [%- SET other_side = 'debit' %]
-    [%- ELSE %]
-     [%- SET order = [ 'debit', 'credit' ] %]
-     [%- SET other_side = 'credit' %]
-    [%- END %]
-
-
-    [%- IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
-    [%- ELSE %]
-    [%- END %]
-
-
-    [%- FOREACH idx = order %]
-     [%- FOREACH row = problem.acc_trans.$idx.entries %]
-      [%- SET curr_row = curr_row + 1 %]
-      <tr class="listrow[% curr_row % 2 %]">
-       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
-       <td align="right">
-        [%- IF idx == 'debit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">
-        [%- IF idx == 'credit' %]
-         [% LxERP.format_amount(row.display_amount, 2) %]
-        [%- END %]
-       </td>
-       <td align="right">[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
-       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
-       <td align="right">[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
-       <td align="center" valign="center"><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
-
-       <td>
-        [%- IF row.taxkey_error %]
-         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
-         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
-         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
-          <option value=""><translate>---please select---</translate></option>
-          [%- FOREACH taxkey = row.correct_taxkeys %]
-           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
-          [%- END %]
-        [%- ELSE %]
-        &nbsp;
-        [%- END %]
-      </tr>
-     [%- END %]
-    [%- END %]
-
-   </table>
-  </p>
-  <hr>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
-   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="<translate>Fix transaction</translate>" disabled>
-   <input type="submit" class="submit" name="action_delete_transaction" value="<translate>Delete transaction</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    function enable_fix_button_maybe() {
-      var all_set = true;
-      $("[name='fixes[].taxkey']").each(function () {
-        var val = $(this).attr('value');
-        if (val == '')
-          all_set = false;
-      });
-
-      $("#fix_transaction_button").attr('disabled', !all_set);
-    }
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction.html b/templates/webpages/acctranscorrections/delete_transaction.html
new file mode 100644 (file)
index 0000000..2c461b0
--- /dev/null
@@ -0,0 +1,26 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<body>
+ <p><div class="listheading">[% title %]</div></p>
+
+ <p>
+  [%- IF module == 'ar' %]
+  [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %]
+  [%- ELSIF module == 'ap' %]
+  [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %]
+  [%- ELSE %]
+  [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %]
+  [%- END %]
+ </p>
+
+ <p>
+  <form method="post" action="acctranscorrections.pl">
+
+   <input type="hidden" name="action" value="redirect">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+  </form>
+ </p>
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation.html
new file mode 100644 (file)
index 0000000..c075471
--- /dev/null
@@ -0,0 +1,33 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<body>
+ <p><div class="listheading">[% title %]</div></p>
+
+ <p>
+  [%- IF module == 'ar' %]
+  [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %]
+  [%- ELSIF module == 'ap' %]
+  [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %]
+  [%- ELSE %]
+  [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %]
+  [%- END %]
+ </p>
+
+ <p>
+  <form method="post" action="acctranscorrections.pl">
+
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="hidden" name="trans_id" value="[% HTML.escape(trans_id) %]">
+   <input type="hidden" name="module" value="[% HTML.escape(module) %]">
+   <input type="hidden" name="reference" value="[% HTML.escape(reference) %]">
+
+   <input type="hidden" name="confirmation" value="1">
+   <input type="hidden" name="action" value="delete_transaction">
+
+   <input type="submit" value="[% 'Yes' | $T8 %]">
+   <input type="button" onclick="history.back()" value="[% 'No' | $T8 %]">
+  </form>
+ </p>
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html
deleted file mode 100644 (file)
index 39fb2c6..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Debitorenbuchung #1 löschen?', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Kreditorenbuchung #1 löschen?', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Dialogbuchung #1 löschen?', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(reference) %]">
-
-   <input type="hidden" name="confirmation" value="1">
-   <input type="hidden" name="action" value="delete_transaction">
-
-   <input type="submit" value="Ja">
-   <input type="button" onclick="history.back()" value="Nein">
-  </form>
- </p>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_en.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_en.html
deleted file mode 100644 (file)
index 1042259..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('Do you really want to delete AR transaction #1?', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('Do you really want to delete AP transaction #1?', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('Do you really want to delete GL transaction #1?', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(reference) %]">
-
-   <input type="hidden" name="confirmation" value="1">
-   <input type="hidden" name="action" value="delete_transaction">
-
-   <input type="submit" value="Yes">
-   <input type="button" onclick="history.back()" value="No">
-  </form>
- </p>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html
deleted file mode 100644 (file)
index bfc6675..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete AR transaction #1?</translate>', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete AP transaction #1?</translate>', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete GL transaction #1?</translate>', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="trans_id" value="[% HTML.escape(trans_id) %]">
-   <input type="hidden" name="module" value="[% HTML.escape(module) %]">
-   <input type="hidden" name="reference" value="[% HTML.escape(reference) %]">
-
-   <input type="hidden" name="confirmation" value="1">
-   <input type="hidden" name="action" value="delete_transaction">
-
-   <input type="submit" value="<translate>Yes</translate>">
-   <input type="button" onclick="history.back()" value="<translate>No</translate>">
-  </form>
- </p>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_de.html b/templates/webpages/acctranscorrections/delete_transaction_de.html
deleted file mode 100644 (file)
index d992ecf..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('Die Debitorenbuchung #1 wurde gelöscht.', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('Die Kreditorenbuchung #1 wurde gelöscht.', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('Die Dialogbuchung #1 wurde gelöscht.', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
-  </form>
- </p>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_en.html b/templates/webpages/acctranscorrections/delete_transaction_en.html
deleted file mode 100644 (file)
index 0e20111..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('The AR transaction #1 has been deleted.', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('The AP transaction #1 has been deleted.', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('The GL transaction #1 has been deleted.', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Re-run analysis">
-  </form>
- </p>
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_master.html b/templates/webpages/acctranscorrections/delete_transaction_master.html
deleted file mode 100644 (file)
index 9bae377..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
- <p><div class="listheading">[% title %]</div></p>
-
- <p>
-  [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('<translate>The AR transaction #1 has been deleted.</translate>', reference)) %]
-  [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('<translate>The AP transaction #1 has been deleted.</translate>', reference)) %]
-  [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('<translate>The GL transaction #1 has been deleted.</translate>', reference)) %]
-  [%- END %]
- </p>
-
- <p>
-  <form method="post" action="acctranscorrections.pl">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
-  </form>
- </p>
-</body>
-</html>
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 (file)
index 0000000..f099928
--- /dev/null
@@ -0,0 +1,23 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
+
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+ </p>
+
+ <p>
+  <form action="acctranscorrections.pl" method="post">
+
+   <input type="hidden" name="action" value="redirect">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html
deleted file mode 100644 (file)
index 134b5d6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Die Probleme mit falschen Steuerschlüssel bei Kreditoren- und Debitorenbuchungen wurden behoben.
-
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_en.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_en.html
deleted file mode 100644 (file)
index b0c72fe..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The wrong taxkeys for AP and AR transactions have been fixed.
-
-  Please re-run the analysis for broken general ledger entries by clicking this button:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Re-run analysis">
-  </form>
- </p>
-
-</body>
-</html>
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 (file)
index 2e75f27..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The wrong taxkeys for AP and AR transactions have been
-   fixed.</translate>
-
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
-  </form>
- </p>
-
-</body>
-</html>
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 (file)
index 0000000..ee0c244
--- /dev/null
@@ -0,0 +1,23 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
+
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+ </p>
+
+ <p>
+  <form action="acctranscorrections.pl" method="post">
+
+   <input type="hidden" name="action" value="redirect">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html
deleted file mode 100644 (file)
index 920e064..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Die falschen Steuerschlüssel für Warenbestandsbuchungen bei Einkaufs- und Verkaufsrechnungen wurden behoben.
-
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_en.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_en.html
deleted file mode 100644 (file)
index 3b3bb60..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.
-
-  Please re-run the analysis for broken general ledger entries by clicking this button:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Re-run analysis">
-  </form>
- </p>
-
-</body>
-</html>
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 (file)
index 8fb9bb8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The wrong taxkeys for inventory transactions for sales
-   and purchase invoices have been fixed.</translate>
-
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html
new file mode 100644 (file)
index 0000000..7a3f044
--- /dev/null
@@ -0,0 +1,23 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The wrong taxkeys have been fixed.' | $T8 %]
+
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+ </p>
+
+ <p>
+  <form action="acctranscorrections.pl" method="post">
+
+   <input type="hidden" name="action" value="redirect">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html
deleted file mode 100644 (file)
index 64a6cda..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Die Steuerschlüssel wurden nach Ihrer Auswahl korrigiert.
-
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_en.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_en.html
deleted file mode 100644 (file)
index 0de8764..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The wrong taxkeys have been fixed.
-
-  Please re-run the analysis for broken general ledger entries by clicking this button:
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Re-run analysis">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html
deleted file mode 100644 (file)
index fca2c2e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The wrong taxkeys have been fixed.</translate>
-
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
- </p>
-
- <p>
-  <form action="acctranscorrections.pl" method="post">
-
-   <input type="hidden" name="action" value="redirect">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
new file mode 100644 (file)
index 0000000..e821874
--- /dev/null
@@ -0,0 +1,34 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
+
+ <div align="center">
+
+  <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
+
+  <h1 class="login">[% 'Version' | $T8 %] [% HTML.escape(version) %]</h1>
+
+  <h2>[% 'Administration' | $T8 %]</h2>
+
+  [% IF error_message %]
+  <p><span class="error_message">[% error_message %]</span></p>
+  [% END %]
+
+  <form method="post" action="admin.pl">
+
+   <table>
+    <tr>
+     <th>[% 'Password' | $T8 %]</th>
+     <td><input type="password" name="rpw" id="rpw"></td>
+     <td><input type="submit" class="submit" name="action" value="[% 'Login' | $T8 %]"></td>
+    </tr>
+    <input type="hidden" name="action" value="login">
+   </table>
+
+  </form>
+
+  <p><a href="http://www.lx-office.org/">[% 'Lx-Office website' | $T8 %]</a></p>
+
+ </div>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/adminlogin_de.html b/templates/webpages/admin/adminlogin_de.html
deleted file mode 100644 (file)
index cc37bee..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
-
- <div align="center">
-
-  <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h1 class="login">Version [% HTML.escape(version) %]</h1>
-
-  <h2>Administration</h2>
-
-  [% IF error_message %]
-  <p><span class="error_message">[% error_message %]</span></p>
-  [% END %]
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <th>Passwort</th>
-     <td><input type="password" name="rpw" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="Anmeldung"></td>
-    </tr>
-    <input type="hidden" name="action" value="login">
-   </table>
-
-  </form>
-
-  <p><a href="http://www.lx-office.org/">Lx-Office-Webseite</a></p>
-
- </div>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/adminlogin_en.html b/templates/webpages/admin/adminlogin_en.html
deleted file mode 100644 (file)
index 0ea7a6d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
-
- <div align="center">
-
-  <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h1 class="login">Version [% HTML.escape(version) %]</h1>
-
-  <h2>Administration</h2>
-
-  [% IF error_message %]
-  <p><span class="error_message">[% error_message %]</span></p>
-  [% END %]
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <th>Password</th>
-     <td><input type="password" name="rpw" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="Login"></td>
-    </tr>
-    <input type="hidden" name="action" value="login">
-   </table>
-
-  </form>
-
-  <p><a href="http://www.lx-office.org/">Lx-Office website</a></p>
-
- </div>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/adminlogin_master.html b/templates/webpages/admin/adminlogin_master.html
deleted file mode 100644 (file)
index 43f5be2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
-
- <div align="center">
-
-  <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h1 class="login"><translate>Version</translate> [% HTML.escape(version) %]</h1>
-
-  <h2><translate>Administration</translate></h2>
-
-  [% IF error_message %]
-  <p><span class="error_message">[% error_message %]</span></p>
-  [% END %]
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <th><translate>Password</translate></th>
-     <td><input type="password" name="rpw" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="<translate>Login</translate>"></td>
-    </tr>
-    <input type="hidden" name="action" value="login">
-   </table>
-
-  </form>
-
-  <p><a href="http://www.lx-office.org/"><translate>Lx-Office website</translate></a></p>
-
- </div>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/backup_dataset.html b/templates/webpages/admin/backup_dataset.html
new file mode 100644 (file)
index 0000000..0737741
--- /dev/null
@@ -0,0 +1,97 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
+
+ <script type="text/javascript">
+  <!--
+      function set_subject() {
+        var subject_template = "[% 'Backup of dataset' | $T8 %]";
+        var subject = document.Form.subject.value;
+
+        if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
+          document.Form.subject.value = subject_template + " " + document.Form.dbname.value;
+        }
+      }
+    -->
+ </script>
+
+ <h2>[% title %]</h2>
+
+ [% IF NO_DATABSES %]
+  [% 'No databases have been found on this server.' | $T8 %]
+
+  [% ELSE %]
+
+  <form name="Form" method="post" action="admin.pl">
+
+   <input type="hidden" name="dbdriver" value="Pg">
+   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
+
+   <p>
+    [% 'Please select the database you want to backup' | $T8 %]:
+    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
+   </p>
+
+   <table>
+    <tr>
+     <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
+     <td valign="top"><label for="destination_download">[% 'Download the backup' | $T8 %]</label></td>
+    </tr>
+
+    <tr>
+     <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
+     <td valign="top">
+      <label for="destination_email">[% 'Send the backup via Email' | $T8 %]</label><br>
+
+      <table>
+       <tr>
+        <td valign="top" align="right">[% 'From' | $T8 %]</td>
+        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
+       </tr>
+
+       <tr>
+        <td valign="top" align="right">[% 'To' | $T8 %]</td>
+        <td valign="top"><input name="to" size="40"></td>
+       </tr>
+
+       <tr>
+        <td valign="top" align="right">[% 'Cc' | $T8 %]</td>
+        <td valign="top"><input name="cc" size="40"></td>
+       </tr>
+
+       <tr>
+        <td valign="top" align="right">[% 'Subject' | $T8 %]</td>
+        <td valign="top"><input name="subject" size="40"></td>
+       </tr>
+
+       <tr>
+        <td valign="top" align="right">[% 'Message' | $T8 %]</td>
+        <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
+       </tr>
+
+      </table>
+
+     </td>
+    </tr>
+
+   </table>
+
+   <input name="callback" type="hidden" value="admin.pl?action=list_users">
+   <input type="hidden" name="nextsub" value="backup_dataset_start">
+   <input type="hidden" name="back_nextsub" value="list_users">
+
+   <hr size="3" noshade>
+
+   <br>
+
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+
+  </form>
+
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/admin/backup_dataset_de.html b/templates/webpages/admin/backup_dataset_de.html
deleted file mode 100644 (file)
index 2ff3799..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
-
- <script type="text/javascript">
-  <!--
-      function set_subject() {
-        var subject_template = "Sicherung der Datenbank";
-        var subject = document.Form.subject.value;
-
-        if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
-          document.Form.subject.value = subject_template + " " + document.Form.dbname.value;
-        }
-      }
-    -->
- </script>
-
- <h2>[% title %]</h2>
-
- [% IF NO_DATABSES %]
-  Auf diesem Server wurden keine Datenbanken gefunden.
-
-  [% ELSE %]
-
-  <form name="Form" method="post" action="admin.pl">
-
-   <input type="hidden" name="dbdriver" value="Pg">
-   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-   <p>
-    Bitte w&auml;hlen Sie die zu sichernde Datenbank gefunden:
-    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
-   </p>
-
-   <table>
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
-     <td valign="top"><label for="destination_download">Die Sicherungsdatei herunterladen</label></td>
-    </tr>
-
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
-     <td valign="top">
-      <label for="destination_email">Die Sicherungsdatei per Email verschicken</label><br>
-
-      <table>
-       <tr>
-        <td valign="top" align="right">Von</td>
-        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">An</td>
-        <td valign="top"><input name="to" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Cc</td>
-        <td valign="top"><input name="cc" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Betreff</td>
-        <td valign="top"><input name="subject" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Nachricht</td>
-        <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
-       </tr>
-
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="backup_dataset_start">
-   <input type="hidden" name="back_nextsub" value="list_users">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="Weiter">
-   <input type="submit" class="submit" name="action" value="Zurück">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/backup_dataset_email_done.html b/templates/webpages/admin/backup_dataset_email_done.html
new file mode 100644 (file)
index 0000000..68f31d7
--- /dev/null
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<body class="admin">
+
+ <h2>[% title %]</h2>
+
+ <p>[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]</p>
+
+ <form method="post" action="admin.pl">
+  <input type="hidden" name="nextsub" value="list_users">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/admin/backup_dataset_email_done_de.html b/templates/webpages/admin/backup_dataset_email_done_de.html
deleted file mode 100644 (file)
index 7f2d34b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p>Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.</p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Weiter">
- </form>
-</body>
-</html>
diff --git a/templates/webpages/admin/backup_dataset_email_done_en.html b/templates/webpages/admin/backup_dataset_email_done_en.html
deleted file mode 100644 (file)
index c0d9d84..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p>The dataset backup has been sent via email to [% HTML.escape(to) %].</p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Continue">
- </form>
-</body>
-</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 (file)
index f76c1e5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p><translate>The dataset backup has been sent via email to [% HTML.escape(to) %].</translate></p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="<translate>Continue</translate>">
- </form>
-</body>
-</html>
diff --git a/templates/webpages/admin/backup_dataset_en.html b/templates/webpages/admin/backup_dataset_en.html
deleted file mode 100644 (file)
index 23bfb0f..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
-
- <script type="text/javascript">
-  <!--
-      function set_subject() {
-        var subject_template = "Backup of dataset";
-        var subject = document.Form.subject.value;
-
-        if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
-          document.Form.subject.value = subject_template + " " + document.Form.dbname.value;
-        }
-      }
-    -->
- </script>
-
- <h2>[% title %]</h2>
-
- [% IF NO_DATABSES %]
-  No databases have been found on this server.
-
-  [% ELSE %]
-
-  <form name="Form" method="post" action="admin.pl">
-
-   <input type="hidden" name="dbdriver" value="Pg">
-   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-   <p>
-    Please select the database you want to backup:
-    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
-   </p>
-
-   <table>
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
-     <td valign="top"><label for="destination_download">Download the backup</label></td>
-    </tr>
-
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
-     <td valign="top">
-      <label for="destination_email">Send the backup via Email</label><br>
-
-      <table>
-       <tr>
-        <td valign="top" align="right">From</td>
-        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">To</td>
-        <td valign="top"><input name="to" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Cc</td>
-        <td valign="top"><input name="cc" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Subject</td>
-        <td valign="top"><input name="subject" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right">Message</td>
-        <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
-       </tr>
-
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="backup_dataset_start">
-   <input type="hidden" name="back_nextsub" value="list_users">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="Continue">
-   <input type="submit" class="submit" name="action" value="Back">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html
deleted file mode 100644 (file)
index d795a9b..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
-
- <script type="text/javascript">
-  <!--
-      function set_subject() {
-        var subject_template = "<translate>Backup of dataset</translate>";
-        var subject = document.Form.subject.value;
-
-        if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
-          document.Form.subject.value = subject_template + " " + document.Form.dbname.value;
-        }
-      }
-    -->
- </script>
-
- <h2>[% title %]</h2>
-
- [% IF NO_DATABSES %]
-  <translate>No databases have been found on this server.</translate>
-
-  [% ELSE %]
-
-  <form name="Form" method="post" action="admin.pl">
-
-   <input type="hidden" name="dbdriver" value="Pg">
-   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-   <p>
-    <translate>Please select the database you want to backup</translate>:
-    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
-   </p>
-
-   <table>
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
-     <td valign="top"><label for="destination_download"><translate>Download the backup</translate></label></td>
-    </tr>
-
-    <tr>
-     <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
-     <td valign="top">
-      <label for="destination_email"><translate>Send the backup via Email</translate></label><br>
-
-      <table>
-       <tr>
-        <td valign="top" align="right"><translate>From</translate></td>
-        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right"><translate>To</translate></td>
-        <td valign="top"><input name="to" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right"><translate>Cc</translate></td>
-        <td valign="top"><input name="cc" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right"><translate>Subject</translate></td>
-        <td valign="top"><input name="subject" size="40"></td>
-       </tr>
-
-       <tr>
-        <td valign="top" align="right"><translate>Message</translate></td>
-        <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
-       </tr>
-
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="backup_dataset_start">
-   <input type="hidden" name="back_nextsub" value="list_users">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_database.html b/templates/webpages/admin/check_auth_database.html
new file mode 100644 (file)
index 0000000..4c55413
--- /dev/null
@@ -0,0 +1,62 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="admin.pl">
+
+  <p>
+   [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %]
+  </p>
+
+  <table border="0">
+   <tr>
+    <td>[% 'Host' | $T8 %]:</td>
+    <td>[% HTML.escape(db_host) %]</td>
+   </tr>
+   <tr>
+    <td>[% 'Port' | $T8 %]:</td>
+    <td>[% HTML.escape(db_port) %]</td>
+   </tr>
+   <tr>
+    <td>[% 'User name' | $T8 %]:</td>
+    <td>[% HTML.escape(db_user) %]</td>
+   </tr>
+   <tr>
+    <td>[% 'Database name' | $T8 %]:</td>
+    <td>[% HTML.escape(db_db) %]</td>
+   </tr>
+  </table>
+
+  <p>
+   [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %]
+  </p>
+
+  <p>[% 'Template database' | $T8 %]: <input name="db_template" value="template1"></p>
+
+  <p>
+   [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %]
+  </p>
+
+  <table border="0"
+   <tr>
+    <td>[% 'Superuser name' | $T8 %]:</td>
+    <td><input name="db_superuser"></td>
+   </tr>
+
+   <tr>
+    <td>[% 'Password' | $T8 %]:</td>
+    <td><input type="password" name="db_superuser_password"></td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
+  <input type="hidden" name="action" value="create_auth_db">
+
+  <input type="submit" class="submit" value="[% 'Create Dataset' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/check_auth_database_de.html b/templates/webpages/admin/check_auth_database_de.html
deleted file mode 100644 (file)
index e1d4ef0..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   Die Datenbank zur Verwaltung der Benutzerdaten und zur Authentifizierung existiert nicht. Sie k&ouml;nnen Lx-Office diese Datenbank mit den folgenden Parametern anlegen lassen:
-  </p>
-
-  <table border="0">
-   <tr>
-    <td>Datenbankcomputer:</td>
-    <td>[% HTML.escape(db_host) %]</td>
-   </tr>
-   <tr>
-    <td>Port:</td>
-    <td>[% HTML.escape(db_port) %]</td>
-   </tr>
-   <tr>
-    <td>Benutzername:</td>
-    <td>[% HTML.escape(db_user) %]</td>
-   </tr>
-   <tr>
-    <td>Datenbankname:</td>
-    <td>[% HTML.escape(db_db) %]</td>
-   </tr>
-  </table>
-
-  <p>
-   Bitte geben Sie den Namen der Datenbank an, die als Vorlage f&uuml;r die neue Datenbank benutzt wird:
-  </p>
-
-  <p>Datenbankvorlage: <input name="db_template" value="template1"></p>
-
-  <p>
-   Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so k&ouml;nnen Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:
-  </p>
-
-  <table border="0"
-   <tr>
-    <td>Datenbankadministrator:</td>
-    <td><input name="db_superuser"></td>
-   </tr>
-
-   <tr>
-    <td>Passwort:</td>
-    <td><input type="password" name="db_superuser_password"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_db">
-
-  <input type="submit" class="submit" value="Datenbank anlegen">
-  <input type="button" class="submit" onclick="history.back()" value="Zurück">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_database_en.html b/templates/webpages/admin/check_auth_database_en.html
deleted file mode 100644 (file)
index ae658b0..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:
-  </p>
-
-  <table border="0">
-   <tr>
-    <td>Host:</td>
-    <td>[% HTML.escape(db_host) %]</td>
-   </tr>
-   <tr>
-    <td>Port:</td>
-    <td>[% HTML.escape(db_port) %]</td>
-   </tr>
-   <tr>
-    <td>User name:</td>
-    <td>[% HTML.escape(db_user) %]</td>
-   </tr>
-   <tr>
-    <td>Database name:</td>
-    <td>[% HTML.escape(db_db) %]</td>
-   </tr>
-  </table>
-
-  <p>
-   Please enter the name of the database that will be used as the template for the new database:
-  </p>
-
-  <p>Template database: <input name="db_template" value="template1"></p>
-
-  <p>
-   If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:
-  </p>
-
-  <table border="0"
-   <tr>
-    <td>Superuser name:</td>
-    <td><input name="db_superuser"></td>
-   </tr>
-
-   <tr>
-    <td>Password:</td>
-    <td><input type="password" name="db_superuser_password"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_db">
-
-  <input type="submit" class="submit" value="Create Dataset">
-  <input type="button" class="submit" onclick="history.back()" value="Back">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_database_master.html b/templates/webpages/admin/check_auth_database_master.html
deleted file mode 100644 (file)
index 313f057..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   <translate>The database for user management and authentication does
-    not exist. You can create let Lx-Office create it with the
-    following parameters:</translate>
-  </p>
-
-  <table border="0">
-   <tr>
-    <td><translate>Host</translate>:</td>
-    <td>[% HTML.escape(db_host) %]</td>
-   </tr>
-   <tr>
-    <td><translate>Port</translate>:</td>
-    <td>[% HTML.escape(db_port) %]</td>
-   </tr>
-   <tr>
-    <td><translate>User name</translate>:</td>
-    <td>[% HTML.escape(db_user) %]</td>
-   </tr>
-   <tr>
-    <td><translate>Database name</translate>:</td>
-    <td>[% HTML.escape(db_db) %]</td>
-   </tr>
-  </table>
-
-  <p>
-   <translate>Please enter the name of the database that will be
-    used as the template for the new database:</translate>
-  </p>
-
-  <p><translate>Template database</translate>: <input name="db_template" value="template1"></p>
-
-  <p>
-   <translate>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:</translate>
-  </p>
-
-  <table border="0"
-   <tr>
-    <td><translate>Superuser name</translate>:</td>
-    <td><input name="db_superuser"></td>
-   </tr>
-
-   <tr>
-    <td><translate>Password</translate>:</td>
-    <td><input type="password" name="db_superuser_password"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_db">
-
-  <input type="submit" class="submit" value="<translate>Create Dataset</translate>">
-  <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_tables.html b/templates/webpages/admin/check_auth_tables.html
new file mode 100644 (file)
index 0000000..64ef01b
--- /dev/null
@@ -0,0 +1,44 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <p>
+  [% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %]
+ </p>
+
+ <table border="0">
+  <tr>
+   <td>[% 'Host' | $T8 %]:</td>
+   <td>[% HTML.escape(db_host) %]</td>
+  </tr>
+  <tr>
+   <td>[% 'Port' | $T8 %]:</td>
+   <td>[% HTML.escape(db_port) %]</td>
+  </tr>
+  <tr>
+   <td>[% 'User name' | $T8 %]:</td>
+   <td>[% HTML.escape(db_user) %]</td>
+  </tr>
+  <tr>
+   <td>[% 'Database name' | $T8 %]:</td>
+   <td>[% HTML.escape(db_db) %]</td>
+  </tr>
+ </table>
+
+ <p>
+  [% 'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.' | $T8 %]
+ </p>
+
+ <form method="post" action="admin.pl">
+
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
+  <input type="hidden" name="action" value="create_auth_tables">
+
+  <input type="submit" class="submit" value="[% 'Create tables' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/check_auth_tables_de.html b/templates/webpages/admin/check_auth_tables_de.html
deleted file mode 100644 (file)
index 79579ba..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  Die Tabellen zum Speichern der Benutzerdaten und zur Benutzerauthentifizierung wurden nicht gefunden. Sie werden in der folgenden Datenbank angelegt:
- </p>
-
- <table border="0">
-  <tr>
-   <td>Datenbankcomputer:</td>
-   <td>[% HTML.escape(db_host) %]</td>
-  </tr>
-  <tr>
-   <td>Port:</td>
-   <td>[% HTML.escape(db_port) %]</td>
-  </tr>
-  <tr>
-   <td>Benutzername:</td>
-   <td>[% HTML.escape(db_user) %]</td>
-  </tr>
-  <tr>
-   <td>Datenbankname:</td>
-   <td>[% HTML.escape(db_db) %]</td>
-  </tr>
- </table>
-
- <p>
-  Wenn Sie einen der Parameter &auml;ndern wollen, so dr&uuml;cken Sie auf den &quot;Zur&uuml;ck&quot;-Button, bearbeiten Sie die Datei &quot;config/authentication.pl&quot;, und melden Sie sich erneut im Administrationsbereich an.
- </p>
-
- <form method="post" action="admin.pl">
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_tables">
-
-  <input type="submit" class="submit" value="Tabellen anlegen">
-  <input type="button" class="submit" onclick="history.back()" value="Zurück">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_tables_en.html b/templates/webpages/admin/check_auth_tables_en.html
deleted file mode 100644 (file)
index 734f36a..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  The tables for user management and authentication do not exist. They will be created in the next step in the following database:
- </p>
-
- <table border="0">
-  <tr>
-   <td>Host:</td>
-   <td>[% HTML.escape(db_host) %]</td>
-  </tr>
-  <tr>
-   <td>Port:</td>
-   <td>[% HTML.escape(db_port) %]</td>
-  </tr>
-  <tr>
-   <td>User name:</td>
-   <td>[% HTML.escape(db_user) %]</td>
-  </tr>
-  <tr>
-   <td>Database name:</td>
-   <td>[% HTML.escape(db_db) %]</td>
-  </tr>
- </table>
-
- <p>
-  If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.
- </p>
-
- <form method="post" action="admin.pl">
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_tables">
-
-  <input type="submit" class="submit" value="Create tables">
-  <input type="button" class="submit" onclick="history.back()" value="Back">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/check_auth_tables_master.html b/templates/webpages/admin/check_auth_tables_master.html
deleted file mode 100644 (file)
index 5ce296e..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <translate>The tables for user management and authentication do not
-   exist. They will be created in the next step in the following
-   database:</translate>
- </p>
-
- <table border="0">
-  <tr>
-   <td><translate>Host</translate>:</td>
-   <td>[% HTML.escape(db_host) %]</td>
-  </tr>
-  <tr>
-   <td><translate>Port</translate>:</td>
-   <td>[% HTML.escape(db_port) %]</td>
-  </tr>
-  <tr>
-   <td><translate>User name</translate>:</td>
-   <td>[% HTML.escape(db_user) %]</td>
-  </tr>
-  <tr>
-   <td><translate>Database name</translate>:</td>
-   <td>[% HTML.escape(db_db) %]</td>
-  </tr>
- </table>
-
- <p>
-  <translate>If you want to change any of these parameters then press
-   the &quot;Back&quot; button, edit the file
-   &quot;config/authentication.pl&quot; and login into the admin module
-   again.</translate>
- </p>
-
- <form method="post" action="admin.pl">
-
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
-  <input type="hidden" name="action" value="create_auth_tables">
-
-  <input type="submit" class="submit" value="<translate>Create tables</translate>">
-  <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html
new file mode 100644 (file)
index 0000000..db60b3b
--- /dev/null
@@ -0,0 +1,67 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin">
+
+  <h2>[% title %]</h2>
+
+  <form method="post" action="admin.pl">
+
+   <p>
+    [% '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 %]
+   </p>
+
+   <table>
+    <tr>
+     <th valign="top" align="right" nowrap>[% 'Existing Datasets' | $T8 %]</th>
+     <td valign="top">[% HTML.escape(dbsources) %]</td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Create Dataset' | $T8 %]</th>
+     <td><input name="db"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Multibyte Encoding' | $T8 %]</th>
+     <td>
+      [%- IF FORCE_DBENCODING %]
+      <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
+      [% HTML.escape(FORCE_DBENCODING) %]
+      [%- ELSE %]
+      <select name="encoding">
+       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+      </select>
+      [%- END %]
+     </td>
+    </tr>
+
+    <tr>
+     <th valign="top" align="right" nowrap>[% 'Create Chart of Accounts' | $T8 %]</th>
+     <td>
+      <select name="chart">
+       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+   </table>
+
+   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
+
+   <input type="hidden" name="callback" value="admin.pl?action=list_users">
+
+   <input type="hidden" name="nextsub" value="dbcreate">
+
+   <hr size="3" noshade>
+
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
+
+  </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/create_dataset_de.html b/templates/webpages/admin/create_dataset_de.html
deleted file mode 100644 (file)
index f830d31..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>
-    Sie können entweder eine neue Datenbank erstellen oder eine existierende auswählen.
-    In letzterem Fall werden die von Lx-Office benötigten Tabellen in dieser existierenden Datenbank angelegt.
-   </p>
-
-   <table>
-    <tr>
-     <th valign="top" align="right" nowrap>existierende Datenbanken</th>
-     <td valign="top">[% HTML.escape(dbsources) %]</td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Datenbank anlegen</th>
-     <td><input name="db"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Schriftsatz</th>
-     <td>
-      [%- IF FORCE_DBENCODING %]
-      <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
-      [% HTML.escape(FORCE_DBENCODING) %]
-      [%- ELSE %]
-      <select name="encoding">
-       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-      </select>
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th valign="top" align="right" nowrap>Kontenplan anlegen</th>
-     <td>
-      <select name="chart">
-       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-   </table>
-
-   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-   <input type="hidden" name="callback" value="admin.pl?action=list_users">
-
-   <input type="hidden" name="nextsub" value="dbcreate">
-
-   <hr size="3" noshade>
-
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/create_dataset_en.html b/templates/webpages/admin/create_dataset_en.html
deleted file mode 100644 (file)
index e213dd6..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>
-    You can either create a new database or chose an existing database.
-    In the latter case the tables needed by Lx-Office will be created in that database.
-   </p>
-
-   <table>
-    <tr>
-     <th valign="top" align="right" nowrap>Existing Datasets</th>
-     <td valign="top">[% HTML.escape(dbsources) %]</td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Create Dataset</th>
-     <td><input name="db"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Multibyte Encoding</th>
-     <td>
-      [%- IF FORCE_DBENCODING %]
-      <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
-      [% HTML.escape(FORCE_DBENCODING) %]
-      [%- ELSE %]
-      <select name="encoding">
-       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-      </select>
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th valign="top" align="right" nowrap>Create Chart of Accounts</th>
-     <td>
-      <select name="chart">
-       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-   </table>
-
-   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-   <input type="hidden" name="callback" value="admin.pl?action=list_users">
-
-   <input type="hidden" name="nextsub" value="dbcreate">
-
-   <hr size="3" noshade>
-
-   <p><input type="submit" class="submit" name="action" value="Continue"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/create_dataset_master.html b/templates/webpages/admin/create_dataset_master.html
deleted file mode 100644 (file)
index 7e633b6..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>
-    <translate>You can either create a new database or chose an
-     existing database.</translate>
-    <translate>In the latter case the tables needed by Lx-Office will
-     be created in that database.</translate>
-   </p>
-
-   <table>
-    <tr>
-     <th valign="top" align="right" nowrap><translate>Existing Datasets</translate></th>
-     <td valign="top">[% HTML.escape(dbsources) %]</td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Create Dataset</translate></th>
-     <td><input name="db"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Multibyte Encoding</translate></th>
-     <td>
-      [%- IF FORCE_DBENCODING %]
-      <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
-      [% HTML.escape(FORCE_DBENCODING) %]
-      [%- ELSE %]
-      <select name="encoding">
-       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-      </select>
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th valign="top" align="right" nowrap><translate>Create Chart of Accounts</translate></th>
-     <td>
-      <select name="chart">
-       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-   </table>
-
-   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-   <input type="hidden" name="callback" value="admin.pl?action=list_users">
-
-   <input type="hidden" name="nextsub" value="dbcreate">
-
-   <hr size="3" noshade>
-
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/create_standard_group_ask.html b/templates/webpages/admin/create_standard_group_ask.html
new file mode 100644 (file)
index 0000000..d5f680f
--- /dev/null
@@ -0,0 +1,50 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="admin.pl">
+
+  <p>
+
+   [% '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 %]
+
+  </p>
+
+  <p>
+
+   [%- '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 %]
+
+  </p>
+
+  <p>
+
+   [% 'Alternatively you can skip this step and create groups yourself.' | $T8 %]
+
+  </p>
+
+  <p>
+
+   [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %]
+
+   [% 'This group will be called &quot;Full Access&quot;.' | $T8 %]
+
+  </p>
+
+  <input type="hidden" name="action" value="dispatcher">
+
+  <p>
+   <input type="submit" class="submit" name="action_create_standard_group" value="[% 'Yes' | $T8 %]">
+   <input type="submit" class="submit" name="action_dont_create_standard_group" value="[% 'No' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/create_standard_group_ask_de.html b/templates/webpages/admin/create_standard_group_ask_de.html
deleted file mode 100644 (file)
index 9b446f5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-
-   Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.
-
-   Sie m&uuml;ssen mindestens eine Benutzergruppe anlegen, ihr Zugriff auf die verschiedenen Funktionsbereiche von Lx-Office gew&auml;hren und Benutzer dieser Gruppe zuordnen.
-
-   Andernfalls haben alle Benutzer nur Zugriff auf ihre Benutzereinstellungen.
-
-  </p>
-
-  <p>
-
-   Im Rahmen dieser Benutzerdatenmigration kann Lx-Office eine solche Gruppe f&uuml;r Sie anlegen und allen Benutzern Zugriff auf alle Lx-Office-Funktionen gew&auml;hren.
-
-   Dieses entspricht dem Verhalten von Lx-Office vor Version 2.4.4.
-
-  </p>
-
-  <p>
-
-   Alternativ k&ouml;nnen Sie diesen Schritt &uuml;berspringen und selber Gruppen anlegen.
-
-  </p>
-
-  <p>
-
-   Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?
-
-   Diese Gruppe wird &quot;Vollzugriff&quot; genannt.
-
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <input type="submit" class="submit" name="action_create_standard_group" value="Ja">
-   <input type="submit" class="submit" name="action_dont_create_standard_group" value="Nein">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/create_standard_group_ask_en.html b/templates/webpages/admin/create_standard_group_ask_en.html
deleted file mode 100644 (file)
index 1c6e825..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-
-   Lx-Office has been switched to group-based access restrictions.
-
-   You have to create at least one group, grant it access to Lx-Office's functions and assign users to it.
-
-   Otherwise all users will only have access to their own settings.
-
-  </p>
-
-  <p>
-
-   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.
-
-   This corresponds to Lx-Office's behavior prior to version 2.4.4.
-
-  </p>
-
-  <p>
-
-   Alternatively you can skip this step and create groups yourself.
-
-  </p>
-
-  <p>
-
-   Do you want Lx-Office to create a group for access to all functions?
-
-   This group will be called &quot;Full Access&quot;.
-
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <input type="submit" class="submit" name="action_create_standard_group" value="Yes">
-   <input type="submit" class="submit" name="action_dont_create_standard_group" value="No">
-  </p>
-
- </form>
-
-</body>
-</html>
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 (file)
index 1513b38..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-
-   <translate>Lx-Office has been switched to group-based access
-    restrictions.</translate>
-
-   <translate>You have to create at least one group, grant it access
-    to Lx-Office's functions and assign users to it.</translate>
-
-   <translate>Otherwise all users will only have access to their own
-    settings.</translate>
-
-  </p>
-
-  <p>
-
-   <translate>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.</translate>
-
-   <translate>This corresponds to Lx-Office's behavior prior to
-    version 2.4.4.</translate>
-
-  </p>
-
-  <p>
-
-   <translate>Alternatively you can skip this step and create groups
-    yourself.</translate>
-
-  </p>
-
-  <p>
-
-   <translate>Do you want Lx-Office to create a group for access to
-    all functions?</translate>
-
-   <translate>This group will be called &quot;Full Access&quot;.</translate>
-
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <input type="submit" class="submit" name="action_create_standard_group" value="<translate>Yes</translate>">
-   <input type="submit" class="submit" name="action_dont_create_standard_group" value="<translate>No</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbadmin.html b/templates/webpages/admin/dbadmin.html
new file mode 100644 (file)
index 0000000..7533dcd
--- /dev/null
@@ -0,0 +1,72 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin">
+
+  <h2>[% title %]</h2>
+
+  <form method="post" action="admin.pl">
+
+   <table>
+    <tr>
+     <td>
+
+      <table>
+
+       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
+
+       <tr>
+        <td>
+         <table>
+
+          <tr>
+
+           <th align="right">[% 'Host' | $T8 %]</th>
+           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
+           <th align="right">[% 'Port' | $T8 %]</th>
+           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
+
+          </tr>
+
+          <tr>
+
+           <th align="right">[% 'User' | $T8 %]</th>
+           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
+           <th align="right">[% 'Password' | $T8 %]</th>
+           <td><input type="password" name="dbpasswd" size="10"></td>
+
+          </tr>
+
+          <tr>
+
+           <th align="right">[% 'Database template' | $T8 %]</th>
+           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
+
+          </tr>
+
+         </table>
+
+        </td>
+       </tr>
+      </table>
+
+      <input name="callback" type="hidden" value="admin.pl?action=list_users">
+
+      <br>
+
+      <input type="submit" class="submit" name="action" value="[% 'Create Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Update Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Delete Dataset' | $T8 %]">
+      [% IF ALLOW_DBBACKUP %]
+       <input type="submit" class="submit" name="action" value="[% 'Backup Dataset' | $T8 %]">
+       <input type="submit" class="submit" name="action" value="[% 'Restore Dataset' | $T8 %]">
+      [% END %]
+     </td>
+    </tr>
+   </table>
+  </form>
+
+  <p>[% 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' | $T8 %]</p>
+
+  <p>[% 'Leave host and port field empty unless you want to make a remote connection.' | $T8 %]</p>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/dbadmin_de.html b/templates/webpages/admin/dbadmin_de.html
deleted file mode 100644 (file)
index 9875604..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <td>
-
-      <table>
-
-       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
-
-       <tr>
-        <td>
-         <table>
-
-          <tr>
-
-           <th align="right">Datenbankcomputer</th>
-           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
-           <th align="right">Port</th>
-           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right">Benutzer</th>
-           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
-           <th align="right">Passwort</th>
-           <td><input type="password" name="dbpasswd" size="10"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right">Datenbankvorlage</th>
-           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
-
-          </tr>
-
-         </table>
-
-        </td>
-       </tr>
-      </table>
-
-      <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-      <br>
-
-      <input type="submit" class="submit" name="action" value="Datenbank anlegen">
-      <input type="submit" class="submit" name="action" value="Datenbank aktualisieren">
-      <input type="submit" class="submit" name="action" value="Datenbank löschen">
-      [% IF ALLOW_DBBACKUP %]
-       <input type="submit" class="submit" name="action" value="Datenbank sichern">
-       <input type="submit" class="submit" name="action" value="Datenbank wiederherstellen">
-      [% END %]
-     </td>
-    </tr>
-   </table>
-  </form>
-
-  <p>In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!</p>
-
-  <p>F&uuml;r lokale Verbindungen "Rechner" und "Port" freilassen.</p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbadmin_en.html b/templates/webpages/admin/dbadmin_en.html
deleted file mode 100644 (file)
index b2b4ceb..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <td>
-
-      <table>
-
-       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
-
-       <tr>
-        <td>
-         <table>
-
-          <tr>
-
-           <th align="right">Host</th>
-           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
-           <th align="right">Port</th>
-           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right">User</th>
-           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
-           <th align="right">Password</th>
-           <td><input type="password" name="dbpasswd" size="10"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right">Database template</th>
-           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
-
-          </tr>
-
-         </table>
-
-        </td>
-       </tr>
-      </table>
-
-      <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-      <br>
-
-      <input type="submit" class="submit" name="action" value="Create Dataset">
-      <input type="submit" class="submit" name="action" value="Update Dataset">
-      <input type="submit" class="submit" name="action" value="Delete Dataset">
-      [% IF ALLOW_DBBACKUP %]
-       <input type="submit" class="submit" name="action" value="Backup Dataset">
-       <input type="submit" class="submit" name="action" value="Restore Dataset">
-      [% END %]
-     </td>
-    </tr>
-   </table>
-  </form>
-
-  <p>This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!</p>
-
-  <p>Leave host and port field empty unless you want to make a remote connection.</p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbadmin_master.html b/templates/webpages/admin/dbadmin_master.html
deleted file mode 100644 (file)
index 8b098c2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <td>
-
-      <table>
-
-       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
-
-       <tr>
-        <td>
-         <table>
-
-          <tr>
-
-           <th align="right"><translate>Host</translate></th>
-           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
-           <th align="right"><translate>Port</translate></th>
-           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right"><translate>User</translate></th>
-           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
-           <th align="right"><translate>Password</translate></th>
-           <td><input type="password" name="dbpasswd" size="10"></td>
-
-          </tr>
-
-          <tr>
-
-           <th align="right"><translate>Database template</translate></th>
-           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
-
-          </tr>
-
-         </table>
-
-        </td>
-       </tr>
-      </table>
-
-      <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-      <br>
-
-      <input type="submit" class="submit" name="action" value="<translate>Create Dataset</translate>">
-      <input type="submit" class="submit" name="action" value="<translate>Update Dataset</translate>">
-      <input type="submit" class="submit" name="action" value="<translate>Delete Dataset</translate>">
-      [% IF ALLOW_DBBACKUP %]
-       <input type="submit" class="submit" name="action" value="<translate>Backup Dataset</translate>">
-       <input type="submit" class="submit" name="action" value="<translate>Restore Dataset</translate>">
-      [% END %]
-     </td>
-    </tr>
-   </table>
-  </form>
-
-  <p><translate>This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!</translate></p>
-
-  <p><translate>Leave host and port field empty unless you want to make a remote connection.</translate></p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbcreate.html b/templates/webpages/admin/dbcreate.html
new file mode 100644 (file)
index 0000000..31fffca
--- /dev/null
@@ -0,0 +1,19 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body class="admin">
+
+  <h2>[% title %]</h2>
+
+  <form method="post" action="admin.pl">
+
+   <p>[% LxERP.t8('The dataset #1 has been successfully created.', db) | html %]</p>
+
+   <input type="hidden" name="nextsub" value="list_users">
+
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
+
+  </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/dbcreate_de.html b/templates/webpages/admin/dbcreate_de.html
deleted file mode 100644 (file)
index 756460f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.</p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbcreate_en.html b/templates/webpages/admin/dbcreate_en.html
deleted file mode 100644 (file)
index 66af4cd..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>The dataset [% HTML.escape(db) %] has been successfully created.</p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="Continue"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbcreate_master.html b/templates/webpages/admin/dbcreate_master.html
deleted file mode 100644 (file)
index d15a2f7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p><translate>The dataset [% HTML.escape(db) %] has been successfully created.</translate></p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
-
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbdelete.html b/templates/webpages/admin/dbdelete.html
new file mode 100644 (file)
index 0000000..c3537da
--- /dev/null
@@ -0,0 +1,17 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<body class="admin">
+
+  <h2>[% title %]</h2>
+
+  <form method="post" action="admin.pl">
+
+   <p>[% LxERP.t8('The database #1 has been successfully deleted.', db) | html %]</p>
+
+   <input type="hidden" name="nextsub" value="list_users">
+
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
+  </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/dbdelete_de.html b/templates/webpages/admin/dbdelete_de.html
deleted file mode 100644 (file)
index c62eb51..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.</p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbdelete_en.html b/templates/webpages/admin/dbdelete_en.html
deleted file mode 100644 (file)
index 1be247d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p>The database [% HTML.escape(db) %] has been successfully deleted.</p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="Continue"></p>
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbdelete_master.html b/templates/webpages/admin/dbdelete_master.html
deleted file mode 100644 (file)
index c744e5d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<body class="admin">
-
-  <h2>[% title %]</h2>
-
-  <form method="post" action="admin.pl">
-
-   <p><translate>The database [% HTML.escape(db) %] has been successfully deleted.</translate></p>
-
-   <input type="hidden" name="nextsub" value="list_users">
-
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
-  </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbupgrade_all_done.html b/templates/webpages/admin/dbupgrade_all_done.html
new file mode 100644 (file)
index 0000000..b55a3d5
--- /dev/null
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[% USE HTML%]
+[% IF NOTHING_TO_DO %]
+ <p>[% 'No datasets have been selected.' | $T8 %]</p>
+
+ [% ELSE %]
+
+ <hr>
+
+ <p>[% 'All database upgrades have been applied.' | $T8 %]</p>
+[% END %]
+
+<form method="post" action="admin.pl">
+ <input type="hidden" name="nextsub" value="list_users">
+
+ <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/dbupgrade_all_done_de.html b/templates/webpages/admin/dbupgrade_all_done_de.html
deleted file mode 100644 (file)
index 0764800..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML%]
-[% IF NOTHING_TO_DO %]
- <p>Es wurden keine Datenbanken ausgew&auml;hlt.</p>
-
- [% ELSE %]
-
- <hr>
-
- <p>Alle Datenbankupdates wurden eingespielt.</p>
-[% END %]
-
-<form method="post" action="admin.pl">
- <input type="hidden" name="nextsub" value="list_users">
-
- <input type="submit" name="action" value="Weiter">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbupgrade_all_done_en.html b/templates/webpages/admin/dbupgrade_all_done_en.html
deleted file mode 100644 (file)
index 3493539..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML%]
-[% IF NOTHING_TO_DO %]
- <p>No datasets have been selected.</p>
-
- [% ELSE %]
-
- <hr>
-
- <p>All database upgrades have been applied.</p>
-[% END %]
-
-<form method="post" action="admin.pl">
- <input type="hidden" name="nextsub" value="list_users">
-
- <input type="submit" name="action" value="Continue">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbupgrade_all_done_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html
deleted file mode 100644 (file)
index 7884201..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML%]
-[% IF NOTHING_TO_DO %]
- <p><translate>No datasets have been selected.</translate></p>
-
- [% ELSE %]
-
- <hr>
-
- <p><translate>All database upgrades have been applied.</translate></p>
-[% END %]
-
-<form method="post" action="admin.pl">
- <input type="hidden" name="nextsub" value="list_users">
-
- <input type="submit" name="action" value="<translate>Continue</translate>">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/dbupgrade_all_header.html b/templates/webpages/admin/dbupgrade_all_header.html
new file mode 100644 (file)
index 0000000..68c7eca
--- /dev/null
@@ -0,0 +1,2 @@
+<body>
+
diff --git a/templates/webpages/admin/dbupgrade_all_header_de.html b/templates/webpages/admin/dbupgrade_all_header_de.html
deleted file mode 100644 (file)
index 68c7eca..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<body>
-
diff --git a/templates/webpages/admin/dbupgrade_all_header_en.html b/templates/webpages/admin/dbupgrade_all_header_en.html
deleted file mode 100644 (file)
index 68c7eca..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<body>
-
diff --git a/templates/webpages/admin/dbupgrade_all_header_master.html b/templates/webpages/admin/dbupgrade_all_header_master.html
deleted file mode 100644 (file)
index 68c7eca..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<body>
-
diff --git a/templates/webpages/admin/dbupgrade_footer.html b/templates/webpages/admin/dbupgrade_footer.html
new file mode 100644 (file)
index 0000000..28e2856
--- /dev/null
@@ -0,0 +1,2 @@
+[%- USE T8 %]
+<p>[% '...done' | $T8 %]</p>
diff --git a/templates/webpages/admin/dbupgrade_footer_de.html b/templates/webpages/admin/dbupgrade_footer_de.html
deleted file mode 100644 (file)
index 3d31bbf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>...fertig</p>
diff --git a/templates/webpages/admin/dbupgrade_footer_en.html b/templates/webpages/admin/dbupgrade_footer_en.html
deleted file mode 100644 (file)
index 52fcef4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p>...done</p>
diff --git a/templates/webpages/admin/dbupgrade_footer_master.html b/templates/webpages/admin/dbupgrade_footer_master.html
deleted file mode 100644 (file)
index 9ac4e8a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<p><translate>...done</translate></p>
diff --git a/templates/webpages/admin/dbupgrade_header.html b/templates/webpages/admin/dbupgrade_header.html
new file mode 100644 (file)
index 0000000..cc37049
--- /dev/null
@@ -0,0 +1,2 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop" width="100%">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/dbupgrade_header_de.html b/templates/webpages/admin/dbupgrade_header_de.html
deleted file mode 100644 (file)
index 8408cf9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[% USE HTML %]<div class="listtop" width="100%">Datenbankaktualisierung ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/dbupgrade_header_en.html b/templates/webpages/admin/dbupgrade_header_en.html
deleted file mode 100644 (file)
index 5e47a71..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[% USE HTML %]<div class="listtop" width="100%">Dataset upgrade ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/dbupgrade_header_master.html b/templates/webpages/admin/dbupgrade_header_master.html
deleted file mode 100644 (file)
index a5a27b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[% USE HTML %]<div class="listtop" width="100%"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/delete_dataset.html b/templates/webpages/admin/delete_dataset.html
new file mode 100644 (file)
index 0000000..2062aed
--- /dev/null
@@ -0,0 +1,32 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin">
+
+ <h2>[% title %]</h2>
+
+ <form method="post" action="admin.pl">
+
+  <p>[% '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 %]</p>
+
+  <p>[% 'Please seletct the dataset you want to delete:' | $T8 %]
+   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
+  </p>
+
+  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
+
+  <input name="callback" type="hidden" value="admin.pl?action=list_users">
+
+
+  <input type="hidden" name="nextsub" value="dbdelete">
+
+  <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/delete_dataset_de.html b/templates/webpages/admin/delete_dataset_de.html
deleted file mode 100644 (file)
index ceb91de..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <form method="post" action="admin.pl">
-
-  <p>Sie k&ouml;nnen nur Datenbanken l&ouml;schen, die momentan nicht in Benutzung sind.
-   Wenn Sie eine solche Datenbank l&ouml;schen wollen, so m&uuml;ssen Sie zuerst die Benutzer bearbeiten, die die fragliche Datenbank benutzen, und sie so &auml;ndern, dass sie eine andere Datenbank benutzen.</p>
-
-  <p>Bitte w&auml;hlen Sie die zu l&ouml;schende Datenbank aus:
-   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
-  </p>
-
-  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-
-  <input type="hidden" name="nextsub" value="dbdelete">
-
-  <p><input type="submit" class="submit" name="action" value="Weiter"></p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/delete_dataset_en.html b/templates/webpages/admin/delete_dataset_en.html
deleted file mode 100644 (file)
index 2dbf9f6..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <form method="post" action="admin.pl">
-
-  <p>You can only delete datasets that are not in use.
-   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.</p>
-
-  <p>Please seletct the dataset you want to delete:
-   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
-  </p>
-
-  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-
-  <input type="hidden" name="nextsub" value="dbdelete">
-
-  <p><input type="submit" class="submit" name="action" value="Continue"></p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/delete_dataset_master.html b/templates/webpages/admin/delete_dataset_master.html
deleted file mode 100644 (file)
index e84509d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- <form method="post" action="admin.pl">
-
-  <p><translate>You can only delete datasets that are not in
-    use.</translate>
-   <translate>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.</translate></p>
-
-  <p><translate>Please seletct the dataset you want to delete:</translate>
-   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
-  </p>
-
-  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
-  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
-  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-
-  <input type="hidden" name="nextsub" value="dbdelete">
-
-  <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/delete_group_confirm.html b/templates/webpages/admin/delete_group_confirm.html
new file mode 100644 (file)
index 0000000..2f684a5
--- /dev/null
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <form name="Form" method="post" action="admin.pl">
+
+
+  <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="confirmed" value="1">
+
+  <div class="listtop">[% 'Delete group' | $T8 %]</div>
+
+  <p>[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
+
+  <input type="hidden" name="delete_nextsub" value="delete_group">
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+  <button type="button" onclick="history.back()">[% 'Back' | $T8 %]</button>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/delete_group_confirm_de.html b/templates/webpages/admin/delete_group_confirm_de.html
deleted file mode 100644 (file)
index 01108f2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="confirmed" value="1">
-
-  <div class="listtop">Gruppe l&ouml;schen</div>
-
-  <p>Wollen Sie wirklich diese Gruppe l&ouml;schen: [% name %] ?</p>
-
-  <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="Löschen">
-  <button type="button" onclick="history.back()">Zurück</button>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/delete_group_confirm_en.html b/templates/webpages/admin/delete_group_confirm_en.html
deleted file mode 100644 (file)
index 97d94fc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="confirmed" value="1">
-
-  <div class="listtop">Delete group</div>
-
-  <p>Do you really want to delete this group: [% name %] ?</p>
-
-  <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="Delete">
-  <button type="button" onclick="history.back()">Back</button>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/delete_group_confirm_master.html b/templates/webpages/admin/delete_group_confirm_master.html
deleted file mode 100644 (file)
index ac7e63e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="confirmed" value="1">
-
-  <div class="listtop"><translate>Delete group</translate></div>
-
-  <p><translate>Do you really want to delete this group:</translate> [% name %] ?</p>
-
-  <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-  <button type="button" onclick="history.back()"><translate>Back</translate></button>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html
new file mode 100644 (file)
index 0000000..177fbc9
--- /dev/null
@@ -0,0 +1,115 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <form name="Form" method="post" action="admin.pl">
+
+  <input type="hidden" name="group_id" value="[% HTML.escape(group_id) %]">
+
+  <input type="hidden" name="back_nextsub" value="edit_groups">
+
+  [% IF message %]
+  <p>[% message %]</p>
+  [% END %]
+
+  <div class="listtop">[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]</div>
+
+  <table width="100%">
+   <tr>
+    <td>
+     <table>
+      <tr class="listheading">
+       <td><b>[% 'Users in<br>this group' | $T8 %]</b></td>
+       <td>&nbsp;</td>
+       <td><b>[% 'Users not in this group' | $T8 %]</b></td>
+      </tr>
+
+      <tr>
+       <td valign="center">
+        <select name="user_id_in_group" size="10">
+         [% FOREACH user = USERS_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
+        </select>
+       </td>
+
+       <td valign="center">
+        <input type="submit" class="submit" name="action" value="[% 'Add to group' | $T8 %]">
+        <br>
+        <br>
+        <input type="submit" class="submit" name="action" value="[% 'Remove from group' | $T8 %]">
+       </td>
+
+       <td valign="center">
+        <select name="user_id_not_in_group" size="10">
+         [% FOREACH user = USERS_NOT_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <td>
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+       </td>
+      </tr>
+     </table>
+
+     <hr>
+
+     <table>
+      <tr class="listheading">
+       <td colspan="2">[% 'Edit rights' | $T8 %]</td>
+      </tr>
+
+      [% FOREACH right = RIGHTS %]
+      <tr>
+       <td>
+        [% IF right.is_section %]
+        <i>[% right.description %]</i>
+        [% ELSE %]
+        <input type="checkbox" name="[% HTML.escape(right.right) %]_granted" id="[% HTML.escape(right.right) %]_granted" [% IF right.granted %]checked[% END %]>
+        <label for="[% HTML.escape(right.right) %]_granted">[% IF right.description %][% right.description %][% ELSE %]<i>[% HTML.escape(right.right) %]</i>[% END %]</label>
+        [% END %]
+       </td>
+      </tr>
+      [% END %]
+
+      <tr>
+       <td>
+        <input type="hidden" name="save_nextsub" value="save_group">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+        &nbsp;
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+       </td>
+      </tr>
+     </table>
+
+     <hr>
+
+     <table>
+      <tr class="listheading">
+       <td colspan="2">[% 'Rename the group' | $T8 %]</td>
+      </tr>
+
+      <tr>
+       <td>[% 'Name' | $T8 %]:</td>
+       <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
+      </tr>
+
+      <tr>
+       <td>[% 'Description' | $T8 %]:</td>
+       <td><input name="description" value="[% HTML.escape(description) %]"></td>
+      </tr>
+
+      <tr>
+       <td>
+        <input type="hidden" name="save_nextsub" value="save_group">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+        &nbsp;
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+  </table>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/edit_group_de.html b/templates/webpages/admin/edit_group_de.html
deleted file mode 100644 (file)
index ec0441b..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(group_id) %]">
-
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop">Gruppe bearbeiten [% HTML.escape(name) %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <td><b>Benutzer in<br>dieser Gruppe</b></td>
-       <td>&nbsp;</td>
-       <td><b>Benutzer nicht in dieser Gruppe</b></td>
-      </tr>
-
-      <tr>
-       <td valign="center">
-        <select name="user_id_in_group" size="10">
-         [% FOREACH user = USERS_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-
-       <td valign="center">
-        <input type="submit" class="submit" name="action" value="Zu Gruppe hinzufügen">
-        <br>
-        <br>
-        <input type="submit" class="submit" name="action" value="Aus Gruppe entfernen">
-       </td>
-
-       <td valign="center">
-        <select name="user_id_not_in_group" size="10">
-         [% FOREACH user = USERS_NOT_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="submit" class="submit" name="action" value="Zurück">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">Rechte bearbeiten</td>
-      </tr>
-
-      [% FOREACH right = RIGHTS %]
-      <tr>
-       <td>
-        [% IF right.is_section %]
-        <i>[% right.description %]</i>
-        [% ELSE %]
-        <input type="checkbox" name="[% HTML.escape(right.right) %]_granted" id="[% HTML.escape(right.right) %]_granted" [% IF right.granted %]checked[% END %]>
-        <label for="[% HTML.escape(right.right) %]_granted">[% IF right.description %][% right.description %][% ELSE %]<i>[% HTML.escape(right.right) %]</i>[% END %]</label>
-        [% END %]
-       </td>
-      </tr>
-      [% END %]
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Speichern">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="Zurück">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">Gruppe umbenennen</td>
-      </tr>
-
-      <tr>
-       <td>Name:</td>
-       <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
-      </tr>
-
-      <tr>
-       <td>Beschreibung:</td>
-       <td><input name="description" value="[% HTML.escape(description) %]"></td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Speichern">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="Zurück">
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group_en.html b/templates/webpages/admin/edit_group_en.html
deleted file mode 100644 (file)
index 641349c..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(group_id) %]">
-
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop">Edit group  [% HTML.escape(name) %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <td><b>Users in<br>this group</b></td>
-       <td>&nbsp;</td>
-       <td><b>Users not in this group</b></td>
-      </tr>
-
-      <tr>
-       <td valign="center">
-        <select name="user_id_in_group" size="10">
-         [% FOREACH user = USERS_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-
-       <td valign="center">
-        <input type="submit" class="submit" name="action" value="Add to group">
-        <br>
-        <br>
-        <input type="submit" class="submit" name="action" value="Remove from group">
-       </td>
-
-       <td valign="center">
-        <select name="user_id_not_in_group" size="10">
-         [% FOREACH user = USERS_NOT_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="submit" class="submit" name="action" value="Back">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">Edit rights</td>
-      </tr>
-
-      [% FOREACH right = RIGHTS %]
-      <tr>
-       <td>
-        [% IF right.is_section %]
-        <i>[% right.description %]</i>
-        [% ELSE %]
-        <input type="checkbox" name="[% HTML.escape(right.right) %]_granted" id="[% HTML.escape(right.right) %]_granted" [% IF right.granted %]checked[% END %]>
-        <label for="[% HTML.escape(right.right) %]_granted">[% IF right.description %][% right.description %][% ELSE %]<i>[% HTML.escape(right.right) %]</i>[% END %]</label>
-        [% END %]
-       </td>
-      </tr>
-      [% END %]
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Save">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="Back">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">Rename the group</td>
-      </tr>
-
-      <tr>
-       <td>Name:</td>
-       <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
-      </tr>
-
-      <tr>
-       <td>Description:</td>
-       <td><input name="description" value="[% HTML.escape(description) %]"></td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Save">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="Back">
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group_master.html b/templates/webpages/admin/edit_group_master.html
deleted file mode 100644 (file)
index 7e7be7e..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-  <input type="hidden" name="group_id" value="[% HTML.escape(group_id) %]">
-
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop"><translate>Edit group </translate> [% HTML.escape(name) %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <td><b><translate>Users in<br>this group</translate></b></td>
-       <td>&nbsp;</td>
-       <td><b><translate>Users not in this group</translate></b></td>
-      </tr>
-
-      <tr>
-       <td valign="center">
-        <select name="user_id_in_group" size="10">
-         [% FOREACH user = USERS_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-
-       <td valign="center">
-        <input type="submit" class="submit" name="action" value="<translate>Add to group</translate>">
-        <br>
-        <br>
-        <input type="submit" class="submit" name="action" value="<translate>Remove from group</translate>">
-       </td>
-
-       <td valign="center">
-        <select name="user_id_not_in_group" size="10">
-         [% FOREACH user = USERS_NOT_IN_GROUP %]<option value="[% HTML.escape(user.id) %]">[% HTML.escape(user.login) %]</option>[% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2"><translate>Edit rights</translate></td>
-      </tr>
-
-      [% FOREACH right = RIGHTS %]
-      <tr>
-       <td>
-        [% IF right.is_section %]
-        <i>[% right.description %]</i>
-        [% ELSE %]
-        <input type="checkbox" name="[% HTML.escape(right.right) %]_granted" id="[% HTML.escape(right.right) %]_granted" [% IF right.granted %]checked[% END %]>
-        <label for="[% HTML.escape(right.right) %]_granted">[% IF right.description %][% right.description %][% ELSE %]<i>[% HTML.escape(right.right) %]</i>[% END %]</label>
-        [% END %]
-       </td>
-      </tr>
-      [% END %]
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2"><translate>Rename the group</translate></td>
-      </tr>
-
-      <tr>
-       <td><translate>Name</translate>:</td>
-       <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
-      </tr>
-
-      <tr>
-       <td><translate>Description</translate>:</td>
-       <td><input name="description" value="[% HTML.escape(description) %]"></td>
-      </tr>
-
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group_membership.html b/templates/webpages/admin/edit_group_membership.html
new file mode 100644 (file)
index 0000000..3792aa4
--- /dev/null
@@ -0,0 +1,47 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+
+ <div class="listtop">[% 'Edit group membership' | $T8 %]</div>
+
+ <p>[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]</p>
+
+ <form action="admin.pl">
+
+  <p>
+   <table border="0">
+    [% FOREACH user = USERS %]
+
+    [% IF user.repeat_headings %]
+    <tr>
+     <th class="listheading" valign="bottom">[% 'Login' | $T8 %]</th>
+     <th class="listheading" valign="bottom">[% 'Name' | $T8 %]</th>
+     [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
+     [% END %]
+    </tr>
+    [% END %]
+
+    <tr class="listrow[% loop.count % 2 %]">
+     <td valign="center">[% HTML.escape(user.login) %]</td>
+     <td valign="center">[% HTML.escape(user.name) %]</td>
+     [% FOREACH group = user.GROUPS %]
+     <td valign="center" align="center">
+      <input type="checkbox" name="u_[% HTML.escape(user.id) %]_g_[% HTML.escape(group.id) %]" [% IF group.is_member %]checked[% END %]>
+     </td>
+     [% END %]
+    </tr>
+    [% END %]
+   </table>
+  </p>
+
+  <input type="hidden" name="save_nextsub" value="save_group_membership">
+  <input type="hidden" name="back_nextsub" value="edit_groups">
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/edit_group_membership_de.html b/templates/webpages/admin/edit_group_membership_de.html
deleted file mode 100644 (file)
index 2b3560c..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop">Gruppenmitgliedschaften bearbeiten</div>
-
- <p>W&auml;hlen Sie diejenigen Checkboxen aus, die die Benutzer zu den gew&uuml;schten Gruppen zuordnen.</p>
-
- <form action="admin.pl">
-
-  <p>
-   <table border="0">
-    [% FOREACH user = USERS %]
-
-    [% IF user.repeat_headings %]
-    <tr>
-     <th class="listheading" valign="bottom">Anmeldung</th>
-     <th class="listheading" valign="bottom">Name</th>
-     [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
-     [% END %]
-    </tr>
-    [% END %]
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="center">[% HTML.escape(user.login) %]</td>
-     <td valign="center">[% HTML.escape(user.name) %]</td>
-     [% FOREACH group = user.GROUPS %]
-     <td valign="center" align="center">
-      <input type="checkbox" name="u_[% HTML.escape(user.id) %]_g_[% HTML.escape(group.id) %]" [% IF group.is_member %]checked[% END %]>
-     </td>
-     [% END %]
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="save_nextsub" value="save_group_membership">
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
-   <input type="submit" class="submit" name="action" value="Zurück">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group_membership_en.html b/templates/webpages/admin/edit_group_membership_en.html
deleted file mode 100644 (file)
index 12819ff..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop">Edit group membership</div>
-
- <p>Select the checkboxes that match users to the groups they should belong to.</p>
-
- <form action="admin.pl">
-
-  <p>
-   <table border="0">
-    [% FOREACH user = USERS %]
-
-    [% IF user.repeat_headings %]
-    <tr>
-     <th class="listheading" valign="bottom">Login</th>
-     <th class="listheading" valign="bottom">Name</th>
-     [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
-     [% END %]
-    </tr>
-    [% END %]
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="center">[% HTML.escape(user.login) %]</td>
-     <td valign="center">[% HTML.escape(user.name) %]</td>
-     [% FOREACH group = user.GROUPS %]
-     <td valign="center" align="center">
-      <input type="checkbox" name="u_[% HTML.escape(user.id) %]_g_[% HTML.escape(group.id) %]" [% IF group.is_member %]checked[% END %]>
-     </td>
-     [% END %]
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="save_nextsub" value="save_group_membership">
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Save">
-   <input type="submit" class="submit" name="action" value="Back">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_group_membership_master.html b/templates/webpages/admin/edit_group_membership_master.html
deleted file mode 100644 (file)
index ce0fa8d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop"><translate>Edit group membership</translate></div>
-
- <p><translate>Select the checkboxes that match users to the groups
-   they should belong to.</translate></p>
-
- <form action="admin.pl">
-
-  <p>
-   <table border="0">
-    [% FOREACH user = USERS %]
-
-    [% IF user.repeat_headings %]
-    <tr>
-     <th class="listheading" valign="bottom"><translate>Login</translate></th>
-     <th class="listheading" valign="bottom"><translate>Name</translate></th>
-     [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
-     [% END %]
-    </tr>
-    [% END %]
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="center">[% HTML.escape(user.login) %]</td>
-     <td valign="center">[% HTML.escape(user.name) %]</td>
-     [% FOREACH group = user.GROUPS %]
-     <td valign="center" align="center">
-      <input type="checkbox" name="u_[% HTML.escape(user.id) %]_g_[% HTML.escape(group.id) %]" [% IF group.is_member %]checked[% END %]>
-     </td>
-     [% END %]
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="save_nextsub" value="save_group_membership">
-  <input type="hidden" name="back_nextsub" value="edit_groups">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_groups.html b/templates/webpages/admin/edit_groups.html
new file mode 100644 (file)
index 0000000..fcf034a
--- /dev/null
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <form name="Form" method="post" action="admin.pl">
+
+
+  [% IF message %]
+  <p>[% message %]</p>
+  [% END %]
+
+  <div class="listtop">[% 'Edit groups' | $T8 %]</div>
+
+  <br>
+
+  <div class="listheading">[% 'Edit and delete a group' | $T8 %]</div>
+
+  [% IF num_groups %]
+  <p>
+   <select name="group_id" size="10">
+    [% FOREACH row = GROUPS %]
+    <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %][% IF row.description %] ([% HTML.escape(row.description) %])[% END %]</option>
+    [% END %]
+   </select>
+  </p>
+  [% ELSE %]
+  <p>[% 'No groups have been added yet.' | $T8 %]</p>
+  [% END %]
+
+  <p>
+   [% IF num_groups %]
+   <input type="hidden" name="edit_nextsub" value="edit_group">
+   <input type="hidden" name="delete_nextsub" value="delete_group">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+   [% END %]
+   <input type="hidden" name="back_nextsub" value="list_users">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+ <hr size="2" noshade>
+
+ <div class="listheading">[% 'Group membership' | $T8 %]</div>
+
+ <p>[% 'Edit the membership of all users in all groups:' | $T8 %]</p>
+
+ <form method="post" action="admin.pl">
+  <p>
+   <input type="hidden" name="edit_nextsub" value="edit_group_membership">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
+  </p>
+
+ </form>
+
+ <hr size="2" noshade>
+
+ <div class="listheading">[% 'Add a new group' | $T8 %]</div>
+
+ <form method="post" action="admin.pl">
+  <p>
+   <table border="0">
+    <tr>
+     <td>[% 'Name' | $T8 %]:</td>
+     <td><input name="name" maxlength="50"></td>
+    </tr>
+
+    <tr>
+     <td>[% 'Description' | $T8 %]:</td>
+     <td><input name="description"></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="hidden" name="add_nextsub" value="add_group">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/edit_groups_de.html b/templates/webpages/admin/edit_groups_de.html
deleted file mode 100644 (file)
index efd3414..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop">Gruppen bearbeiten</div>
-
-  <br>
-
-  <div class="listheading">Gruppen bearbeiten und l&ouml;schen</div>
-
-  [% IF num_groups %]
-  <p>
-   <select name="group_id" size="10">
-    [% FOREACH row = GROUPS %]
-    <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %][% IF row.description %] ([% HTML.escape(row.description) %])[% END %]</option>
-    [% END %]
-   </select>
-  </p>
-  [% ELSE %]
-  <p>Es wurden noch keine Gruppen angelegt.</p>
-  [% END %]
-
-  <p>
-   [% IF num_groups %]
-   <input type="hidden" name="edit_nextsub" value="edit_group">
-   <input type="hidden" name="delete_nextsub" value="delete_group">
-   <input type="submit" class="submit" name="action" value="Bearbeiten">
-   <input type="submit" class="submit" name="action" value="Löschen">
-   [% END %]
-   <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="Zurück">
-  </p>
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading">Gruppenzugehörigkeit</div>
-
- <p>Bearbeiten der Mitgliedschaft aller Benutzer in allen Gruppen:</p>
-
- <form method="post" action="admin.pl">
-  <p>
-   <input type="hidden" name="edit_nextsub" value="edit_group_membership">
-   <input type="submit" class="submit" name="action" value="Bearbeiten">
-  </p>
-
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading">Neue Gruppe erfassen</div>
-
- <form method="post" action="admin.pl">
-  <p>
-   <table border="0">
-    <tr>
-     <td>Name:</td>
-     <td><input name="name" maxlength="50"></td>
-    </tr>
-
-    <tr>
-     <td>Beschreibung:</td>
-     <td><input name="description"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="Erfassen">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_groups_en.html b/templates/webpages/admin/edit_groups_en.html
deleted file mode 100644 (file)
index 1a00b24..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop">Edit groups</div>
-
-  <br>
-
-  <div class="listheading">Edit and delete a group</div>
-
-  [% IF num_groups %]
-  <p>
-   <select name="group_id" size="10">
-    [% FOREACH row = GROUPS %]
-    <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %][% IF row.description %] ([% HTML.escape(row.description) %])[% END %]</option>
-    [% END %]
-   </select>
-  </p>
-  [% ELSE %]
-  <p>No groups have been added yet.</p>
-  [% END %]
-
-  <p>
-   [% IF num_groups %]
-   <input type="hidden" name="edit_nextsub" value="edit_group">
-   <input type="hidden" name="delete_nextsub" value="delete_group">
-   <input type="submit" class="submit" name="action" value="Edit">
-   <input type="submit" class="submit" name="action" value="Delete">
-   [% END %]
-   <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="Back">
-  </p>
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading">Group membership</div>
-
- <p>Edit the membership of all users in all groups:</p>
-
- <form method="post" action="admin.pl">
-  <p>
-   <input type="hidden" name="edit_nextsub" value="edit_group_membership">
-   <input type="submit" class="submit" name="action" value="Edit">
-  </p>
-
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading">Add a new group</div>
-
- <form method="post" action="admin.pl">
-  <p>
-   <table border="0">
-    <tr>
-     <td>Name:</td>
-     <td><input name="name" maxlength="50"></td>
-    </tr>
-
-    <tr>
-     <td>Description:</td>
-     <td><input name="description"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="Add">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_groups_master.html b/templates/webpages/admin/edit_groups_master.html
deleted file mode 100644 (file)
index 97cde08..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
-
-  [% IF message %]
-  <p>[% message %]</p>
-  [% END %]
-
-  <div class="listtop"><translate>Edit groups</translate></div>
-
-  <br>
-
-  <div class="listheading"><translate>Edit and delete a group</translate></div>
-
-  [% IF num_groups %]
-  <p>
-   <select name="group_id" size="10">
-    [% FOREACH row = GROUPS %]
-    <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %][% IF row.description %] ([% HTML.escape(row.description) %])[% END %]</option>
-    [% END %]
-   </select>
-  </p>
-  [% ELSE %]
-  <p><translate>No groups have been added yet.</translate></p>
-  [% END %]
-
-  <p>
-   [% IF num_groups %]
-   <input type="hidden" name="edit_nextsub" value="edit_group">
-   <input type="hidden" name="delete_nextsub" value="delete_group">
-   <input type="submit" class="submit" name="action" value="<translate>Edit</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-   [% END %]
-   <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
-  </p>
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading"><translate>Group membership</translate></div>
-
- <p><translate>Edit the membership of all users in all groups:</translate></p>
-
- <form method="post" action="admin.pl">
-  <p>
-   <input type="hidden" name="edit_nextsub" value="edit_group_membership">
-   <input type="submit" class="submit" name="action" value="<translate>Edit</translate>">
-  </p>
-
- </form>
-
- <hr size="2" noshade>
-
- <div class="listheading"><translate>Add a new group</translate></div>
-
- <form method="post" action="admin.pl">
-  <p>
-   <table border="0">
-    <tr>
-     <td><translate>Name</translate>:</td>
-     <td><input name="name" maxlength="50"></td>
-    </tr>
-
-    <tr>
-     <td><translate>Description</translate>:</td>
-     <td><input name="description"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
new file mode 100644 (file)
index 0000000..b302780
--- /dev/null
@@ -0,0 +1,289 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin">
+
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <script type="text/javascript">
+  <!--
+      function open_connection_test_window() {
+        // host name port user passwd
+        var url = "admin.pl?INPUT_ENCODING=UTF-8&action=test_db_connection&" +
+          "dbhost="   + encodeURIComponent(get_input_value("dbhost"))   + "&" +
+          "dbport="   + encodeURIComponent(get_input_value("dbport"))   + "&" +
+          "dbname="   + encodeURIComponent(get_input_value("dbname"))   + "&" +
+          "dbuser="   + encodeURIComponent(get_input_value("dbuser"))   + "&" +
+          "dbpasswd=" + encodeURIComponent(get_input_value("dbpasswd")) + "&";
+
+        var parm = centerParms(400,300) + ",width=400,height=300,status=yes,scrollbars=yes";
+
+        window.open(url, "_new_generic", parm);
+      }
+    -->
+ </script>
+
+ <form name="Form" id="Form" method="post" action="admin.pl">
+
+  <div class="listtop" width="100%">[% title %]</div>
+
+  <table width="100%">
+   <tr valign="top">
+    <td>
+     <table>
+      <tr>
+       <th align="right">[% 'Login' | $T8 %]</th>
+       <td>
+        [%- IF edit %]
+         <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
+        [%- ELSE %]
+         <input name="login" value="[% HTML.escape(myc_login) %]">
+        [%- END %]
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Password' | $T8 %]</th>
+       <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Name' | $T8 %]</th>
+       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'E-mail' | $T8 %]</th>
+       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">[% 'Signature' | $T8 %]</th>
+       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Phone' | $T8 %]</th>
+       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Fax' | $T8 %]</th>
+       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Company' | $T8 %]</th>
+       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">[% 'Address' | $T8 %]</th>
+       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">[% 'Tax number' | $T8 %]</th>
+       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">[% 'Ust-IDNr' | $T8 %]</th>
+       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">[% 'DUNS-Nr' | $T8 %]</th>
+       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
+      </tr>
+     </table>
+    </td>
+
+    <td>
+     <table>
+      <tr>
+       <th align="right">[% 'Date Format' | $T8 %]</th>
+       <td>
+        <select name="dateformat">
+         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Number Format' | $T8 %]</th>
+       <td>
+        <select name="numberformat">
+         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
+       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Language' | $T8 %]</th>
+       <td>
+        <select name="countrycode">
+         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Stylesheet' | $T8 %]</th>
+       <td>
+        <select name="userstylesheet">
+         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Printer' | $T8 %]</th>
+       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
+      </tr>
+      <tr>
+       <th align="right">[% 'Use Templates' | $T8 %]</th>
+       <td>
+        <select name="usetemplates">
+         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right">[% 'New Templates' | $T8 %]</th>
+       <td><input name="newtemplates"></td>
+      </tr>
+      <tr>
+       <th align="right">[% 'Setup Templates' | $T8 %]</th>
+       <td>
+        <select name="mastertemplates">
+         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right">[% 'Setup Menu' | $T8 %]</th>
+       <td>
+        <select name="menustyle">
+         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+         <option value="neu"[% IF menustyle_neu %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+         <option value="xml"[% IF menustyle_xml %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+         <option value="old"[% IF menustyle_old %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align='right'>[% 'Mandatory Departments' | $T8 %]</th>
+       <td>
+        <input type='radio' name='mandatory_departments' value='0' [% IF !myc_mandatory_departments %] checked[% END %]> [% 'No' | $T8 %]
+        <input type='radio' name='mandatory_departments' value='1' [% IF  myc_mandatory_departments %] checked[% END %]> [% 'Yes' | $T8 %]
+       </td>
+      </tr>
+
+      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
+     </table>
+    </td>
+   </tr>
+
+   <tr class="listheading">
+    <th colspan="2">[% 'Database' | $T8 %]</th>
+   </tr>
+
+   <tr>
+    <td colspan="2">
+     <table>
+      <tr>
+       <th align="right">[% 'Driver' | $T8 %]</th>
+       <td>PostgreSQL</td>
+       <th align="right">[% 'Host' | $T8 %]</th>
+       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'Dataset' | $T8 %]</th>
+       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
+       <th align="right">[% 'Port' | $T8 %]</th>
+       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
+      </tr>
+
+      <tr>
+       <th align="right">[% 'User' | $T8 %]</th>
+       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
+       <th align="right">[% 'Password' | $T8 %]</th>
+       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
+      </tr>
+
+      <tr>
+       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="[% 'Test connection' | $T8 %]"></td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+
+   [% IF edit %]
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+   <tr class="listheading">
+    <th colspan="2">[% 'Group membership' | $T8 %]</th>
+   </tr>
+
+   <tr>
+    <td colspan="2">[% 'The user is a member in the following group(s):' | $T8 %]</td>
+   </tr>
+
+   <tr>
+    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
+     [% UNLESS loop.last %] | [% END %][% END %]</td>
+   </tr>
+   [% END %]
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+  </table>
+
+  <input name="callback" type="hidden" value="admin.pl?action=list_users">
+
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="submit" class="submit" name="action_save_user" value="[% 'Save' | $T8 %]">
+
+  [% IF edit %]
+   [% FOREACH row = GROUPS %]
+    <input type="hidden" name="new_user_group_ids[]" value="[% HTML.escape(row.id) %]">
+   [% END %]
+   <input type="hidden" name="new_user_login" id="new_user_login" value="">
+   <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
+   <input type="button" class="submit" id="save_as_new_button" value="[% 'Save as new' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete_user" value="[% 'Delete' | $T8 %]">
+   <input type="hidden" name="edit" value="1">
+  [% END %]
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+    $(document).ready(function() {
+      $("#save_as_new_button").click(function() {
+        var new_user_login = prompt('[% 'Please enter the login for the new user.' | $T8 %]', '');
+        if (!new_user_login || (new_user_login == ''))
+          return;
+
+        $("#action_save_user_as_new").attr('value', '1');
+        $("#new_user_login").attr('value', new_user_login);
+        $("#Form").submit();
+      });
+    });
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
deleted file mode 100644 (file)
index 4d62ba4..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-      function open_connection_test_window() {
-        // host name port user passwd
-        var url = "admin.pl?INPUT_ENCODING=UTF-8&action=test_db_connection&" +
-          "dbhost="   + encodeURIComponent(get_input_value("dbhost"))   + "&" +
-          "dbport="   + encodeURIComponent(get_input_value("dbport"))   + "&" +
-          "dbname="   + encodeURIComponent(get_input_value("dbname"))   + "&" +
-          "dbuser="   + encodeURIComponent(get_input_value("dbuser"))   + "&" +
-          "dbpasswd=" + encodeURIComponent(get_input_value("dbpasswd")) + "&";
-
-        var parm = centerParms(400,300) + ",width=400,height=300,status=yes,scrollbars=yes";
-
-        window.open(url, "_new_generic", parm);
-      }
-    -->
- </script>
-
- <form name="Form" id="Form" method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right">Anmeldung</th>
-       <td>
-        [%- IF edit %]
-         <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
-        [%- ELSE %]
-         <input name="login" value="[% HTML.escape(myc_login) %]">
-        [%- END %]
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Passwort</th>
-       <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
-      </tr>
-
-      <tr>
-       <th align="right">Name</th>
-       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">eMail</th>
-       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Unterschrift</th>
-       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <th align="right">Telefon</th>
-       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Fax</th>
-       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Firma</th>
-       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Adresse</th>
-       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Steuernummer</th>
-       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">USt-IdNr.</th>
-       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">DUNS-Nr.</th>
-       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
-      </tr>
-     </table>
-    </td>
-
-    <td>
-     <table>
-      <tr>
-       <th align="right">Datumsformat</th>
-       <td>
-        <select name="dateformat">
-         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Zahlenformat</th>
-       <td>
-        <select name="numberformat">
-         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Auswahllistenbegrenzung</th>
-       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Sprache</th>
-       <td>
-        <select name="countrycode">
-         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Stilvorlage</th>
-       <td>
-        <select name="userstylesheet">
-         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Drucker</th>
-       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
-      </tr>
-      <tr>
-       <th align="right">benutze Vorlagen</th>
-       <td>
-        <select name="usetemplates">
-         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right">neue Vorlagen</th>
-       <td><input name="newtemplates"></td>
-      </tr>
-      <tr>
-       <th align="right">Vorlagen auswählen</th>
-       <td>
-        <select name="mastertemplates">
-         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Menüsetup</th>
-       <td>
-        <select name="menustyle">
-         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>Oben (mit CSS)</option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>Oben (mit CSS, neu)</option>
-         <option value="neu"[% IF menustyle_neu %] selected[% END %]>Oben (mit Javascript)</option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]>Oben (XUL; nur f&uuml;r Mozilla Firefox)</option>
-         <option value="old"[% IF menustyle_old %] selected[% END %]>Alt (seitlich)</option>
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align='right'>Benutzer muss Abteilungen vergeben</th>
-       <td>
-        <input type='radio' name='mandatory_departments' value='0' [% IF !myc_mandatory_departments %] checked[% END %]> Nein
-        <input type='radio' name='mandatory_departments' value='1' [% IF  myc_mandatory_departments %] checked[% END %]> Ja
-       </td>
-      </tr>
-
-      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
-     </table>
-    </td>
-   </tr>
-
-   <tr class="listheading">
-    <th colspan="2">Datenbank</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">
-     <table>
-      <tr>
-       <th align="right">Treiber</th>
-       <td>PostgreSQL</td>
-       <th align="right">Datenbankcomputer</th>
-       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Datenbank</th>
-       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
-       <th align="right">Port</th>
-       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Benutzer</th>
-       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
-       <th align="right">Passwort</th>
-       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
-      </tr>
-
-      <tr>
-       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="Verbindung testen"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   [% IF edit %]
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr class="listheading">
-    <th colspan="2">Gruppenzugehörigkeit</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">Der Benutzer ist Mitglied in den folgenden Gruppen:</td>
-   </tr>
-
-   <tr>
-    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
-     [% UNLESS loop.last %] | [% END %][% END %]</td>
-   </tr>
-   [% END %]
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-  </table>
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_save_user" value="Speichern">
-
-  [% IF edit %]
-   [% FOREACH row = GROUPS %]
-    <input type="hidden" name="new_user_group_ids[]" value="[% HTML.escape(row.id) %]">
-   [% END %]
-   <input type="hidden" name="new_user_login" id="new_user_login" value="">
-   <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
-   <input type="button" class="submit" id="save_as_new_button" value="als neu speichern">
-   <input type="submit" class="submit" name="action_delete_user" value="Löschen">
-   <input type="hidden" name="edit" value="1">
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#save_as_new_button").click(function() {
-        var new_user_login = prompt('Bitte geben Sie das Login für den neuen Benutzer ein.', '');
-        if (!new_user_login || (new_user_login == ''))
-          return;
-
-        $("#action_save_user_as_new").attr('value', '1');
-        $("#new_user_login").attr('value', new_user_login);
-        $("#Form").submit();
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_user_en.html b/templates/webpages/admin/edit_user_en.html
deleted file mode 100644 (file)
index 92719ef..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-      function open_connection_test_window() {
-        // host name port user passwd
-        var url = "admin.pl?INPUT_ENCODING=UTF-8&action=test_db_connection&" +
-          "dbhost="   + encodeURIComponent(get_input_value("dbhost"))   + "&" +
-          "dbport="   + encodeURIComponent(get_input_value("dbport"))   + "&" +
-          "dbname="   + encodeURIComponent(get_input_value("dbname"))   + "&" +
-          "dbuser="   + encodeURIComponent(get_input_value("dbuser"))   + "&" +
-          "dbpasswd=" + encodeURIComponent(get_input_value("dbpasswd")) + "&";
-
-        var parm = centerParms(400,300) + ",width=400,height=300,status=yes,scrollbars=yes";
-
-        window.open(url, "_new_generic", parm);
-      }
-    -->
- </script>
-
- <form name="Form" id="Form" method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right">Login</th>
-       <td>
-        [%- IF edit %]
-         <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
-        [%- ELSE %]
-         <input name="login" value="[% HTML.escape(myc_login) %]">
-        [%- END %]
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Password</th>
-       <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
-      </tr>
-
-      <tr>
-       <th align="right">Name</th>
-       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">E-mail</th>
-       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Signature</th>
-       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <th align="right">Phone</th>
-       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Fax</th>
-       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Company</th>
-       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Address</th>
-       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Tax number</th>
-       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">Ust-IDNr</th>
-       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right">DUNS-Nr</th>
-       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
-      </tr>
-     </table>
-    </td>
-
-    <td>
-     <table>
-      <tr>
-       <th align="right">Date Format</th>
-       <td>
-        <select name="dateformat">
-         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Number Format</th>
-       <td>
-        <select name="numberformat">
-         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Dropdown Limit</th>
-       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Language</th>
-       <td>
-        <select name="countrycode">
-         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Stylesheet</th>
-       <td>
-        <select name="userstylesheet">
-         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right">Printer</th>
-       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
-      </tr>
-      <tr>
-       <th align="right">Use Templates</th>
-       <td>
-        <select name="usetemplates">
-         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right">New Templates</th>
-       <td><input name="newtemplates"></td>
-      </tr>
-      <tr>
-       <th align="right">Setup Templates</th>
-       <td>
-        <select name="mastertemplates">
-         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Setup Menu</th>
-       <td>
-        <select name="menustyle">
-         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>Top (CSS)</option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>Top (CSS) new</option>
-         <option value="neu"[% IF menustyle_neu %] selected[% END %]>Top (Javascript)</option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]>Top (XUL; only for Mozilla Firefox)</option>
-         <option value="old"[% IF menustyle_old %] selected[% END %]>Old (on the side)</option>
-        </select>
-       </td>
-      </tr>
-
-      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
-     </table>
-    </td>
-   </tr>
-
-   <tr class="listheading">
-    <th colspan="2">Database</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">
-     <table>
-      <tr>
-       <th align="right">Driver</th>
-       <td>PostgreSQL</td>
-       <th align="right">Host</th>
-       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">Dataset</th>
-       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
-       <th align="right">Port</th>
-       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right">User</th>
-       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
-       <th align="right">Password</th>
-       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
-      </tr>
-
-      <tr>
-       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="Test connection"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   [% IF edit %]
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr class="listheading">
-    <th colspan="2">Group membership</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">The user is a member in the following group(s):</td>
-   </tr>
-
-   <tr>
-    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
-     [% UNLESS loop.last %] | [% END %][% END %]</td>
-   </tr>
-   [% END %]
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-  </table>
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_save_user" value="Save">
-
-  [% IF edit %]
-   [% FOREACH row = GROUPS %]
-    <input type="hidden" name="new_user_group_ids[]" value="[% HTML.escape(row.id) %]">
-   [% END %]
-   <input type="hidden" name="new_user_login" id="new_user_login" value="">
-   <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
-   <input type="button" class="submit" id="save_as_new_button" value="Save as new">
-   <input type="submit" class="submit" name="action_delete_user" value="Delete">
-   <input type="hidden" name="edit" value="1">
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#save_as_new_button").click(function() {
-        var new_user_login = prompt('Please enter the login for the new user.', '');
-        if (!new_user_login || (new_user_login == ''))
-          return;
-
-        $("#action_save_user_as_new").attr('value', '1');
-        $("#new_user_login").attr('value', new_user_login);
-        $("#Form").submit();
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
deleted file mode 100644 (file)
index c5793bb..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-      function open_connection_test_window() {
-        // host name port user passwd
-        var url = "admin.pl?INPUT_ENCODING=UTF-8&action=test_db_connection&" +
-          "dbhost="   + encodeURIComponent(get_input_value("dbhost"))   + "&" +
-          "dbport="   + encodeURIComponent(get_input_value("dbport"))   + "&" +
-          "dbname="   + encodeURIComponent(get_input_value("dbname"))   + "&" +
-          "dbuser="   + encodeURIComponent(get_input_value("dbuser"))   + "&" +
-          "dbpasswd=" + encodeURIComponent(get_input_value("dbpasswd")) + "&";
-
-        var parm = centerParms(400,300) + ",width=400,height=300,status=yes,scrollbars=yes";
-
-        window.open(url, "_new_generic", parm);
-      }
-    -->
- </script>
-
- <form name="Form" id="Form" method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right"><translate>Login</translate></th>
-       <td>
-        [%- IF edit %]
-         <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
-        [%- ELSE %]
-         <input name="login" value="[% HTML.escape(myc_login) %]">
-        [%- END %]
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Password</translate></th>
-       <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Name</translate></th>
-       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>E-mail</translate></th>
-       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right"><translate>Signature</translate></th>
-       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Phone</translate></th>
-       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Fax</translate></th>
-       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Company</translate></th>
-       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right"><translate>Address</translate></th>
-       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right"><translate>Tax number</translate></th>
-       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right"><translate>Ust-IDNr</translate></th>
-       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
-      </tr>
-
-      <tr valign="top">
-       <th align="right"><translate>DUNS-Nr</translate></th>
-       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
-      </tr>
-     </table>
-    </td>
-
-    <td>
-     <table>
-      <tr>
-       <th align="right"><translate>Date Format</translate></th>
-       <td>
-        <select name="dateformat">
-         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Number Format</translate></th>
-       <td>
-        <select name="numberformat">
-         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Dropdown Limit</translate></th>
-       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Language</translate></th>
-       <td>
-        <select name="countrycode">
-         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Stylesheet</translate></th>
-       <td>
-        <select name="userstylesheet">
-         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Printer</translate></th>
-       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
-      </tr>
-      <tr>
-       <th align="right"><translate>Use Templates</translate></th>
-       <td>
-        <select name="usetemplates">
-         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right"><translate>New Templates</translate></th>
-       <td><input name="newtemplates"></td>
-      </tr>
-      <tr>
-       <th align="right"><translate>Setup Templates</translate></th>
-       <td>
-        <select name="mastertemplates">
-         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
-         [% END %]
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align="right"><translate>Setup Menu</translate></th>
-       <td>
-        <select name="menustyle">
-         <option value="v3"[% IF menustyle_v3 %] selected[% END %]><translate>Top (CSS)</translate></option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]><translate>Top (CSS) new</translate></option>
-         <option value="neu"[% IF menustyle_neu %] selected[% END %]><translate>Top (Javascript)</translate></option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]><translate>Top (XUL; only for Mozilla Firefox)</translate></option>
-         <option value="old"[% IF menustyle_old %] selected[% END %]><translate>Old (on the side)</translate></option>
-        </select>
-       </td>
-      </tr>
-      <tr>
-       <th align='right'><translate>Mandatory Departments</translate></th>
-       <td>
-        <input type='radio' name='mandatory_departments' value='0' [% IF !myc_mandatory_departments %] checked[% END %]> <translate>No</translate>
-        <input type='radio' name='mandatory_departments' value='1' [% IF  myc_mandatory_departments %] checked[% END %]> <translate>Yes</translate>
-       </td>
-      </tr>
-
-      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
-     </table>
-    </td>
-   </tr>
-
-   <tr class="listheading">
-    <th colspan="2"><translate>Database</translate></th>
-   </tr>
-
-   <tr>
-    <td colspan="2">
-     <table>
-      <tr>
-       <th align="right"><translate>Driver</translate></th>
-       <td>PostgreSQL</td>
-       <th align="right"><translate>Host</translate></th>
-       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>Dataset</translate></th>
-       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
-       <th align="right"><translate>Port</translate></th>
-       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
-      </tr>
-
-      <tr>
-       <th align="right"><translate>User</translate></th>
-       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
-       <th align="right"><translate>Password</translate></th>
-       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
-      </tr>
-
-      <tr>
-       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="<translate>Test connection</translate>"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   [% IF edit %]
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr class="listheading">
-    <th colspan="2"><translate>Group membership</translate></th>
-   </tr>
-
-   <tr>
-    <td colspan="2"><translate>The user is a member in the following group(s):</translate></td>
-   </tr>
-
-   <tr>
-    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
-     [% UNLESS loop.last %] | [% END %][% END %]</td>
-   </tr>
-   [% END %]
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-  </table>
-
-  <input name="callback" type="hidden" value="admin.pl?action=list_users">
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_save_user" value="<translate>Save</translate>">
-
-  [% IF edit %]
-   [% FOREACH row = GROUPS %]
-    <input type="hidden" name="new_user_group_ids[]" value="[% HTML.escape(row.id) %]">
-   [% END %]
-   <input type="hidden" name="new_user_login" id="new_user_login" value="">
-   <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
-   <input type="button" class="submit" id="save_as_new_button" value="<translate>Save as new</translate>">
-   <input type="submit" class="submit" name="action_delete_user" value="<translate>Delete</translate>">
-   <input type="hidden" name="edit" value="1">
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#save_as_new_button").click(function() {
-        var new_user_login = prompt('<translate>Please enter the login for the new user.</translate>', '');
-        if (!new_user_login || (new_user_login == ''))
-          return;
-
-        $("#action_save_user_as_new").attr('value', '1');
-        $("#new_user_login").attr('value', new_user_login);
-        $("#Form").submit();
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html
new file mode 100644 (file)
index 0000000..9ea6b23
--- /dev/null
@@ -0,0 +1,74 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin" onload="">
+
+ <form method="post" action="admin.pl">
+
+  <div class="listtop" width="100%">[% title %]</div>
+
+  <p>
+   <table width="100%">
+    <tr>
+     <th class="listtop">[% 'Login' | $T8 %]</th>
+     <th class="listtop">[% 'Name' | $T8 %]</th>
+     <th class="listtop">[% 'Company' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Templates' | $T8 %]</th>
+    </tr>
+
+    [% FOREACH row = MEMBERS %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
+      <td>[% HTML.escape(row.name) %]</td>
+      <td>[% HTML.escape(row.company) %]</td>
+      <td>[% HTML.escape(row.dbdriver) %]</td>
+      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
+      <td>[% HTML.escape(row.dbname) %]</td>
+      <td>[% HTML.escape(row.templates) %]</td>
+     </tr>
+    [% END %]
+
+    <td colspan="7"><hr size="3" noshade></td>
+   </table>
+  </p>
+
+
+  <input type="submit" class="submit" name="action" value="[% 'Add User' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Edit groups' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Pg Database Administration' | $T8 %]">
+  [% IF LOCKED %]
+   <input type="submit" class="submit" name="action" value="[% 'Unlock System' | $T8 %]">
+   [% ELSE %]
+   <input type="submit" class="submit" name="action" value="[% 'Lock System' | $T8 %]">
+  [% END %]
+  <input type="submit" class="submit" name="action" value="[% 'Logout' | $T8 %]">
+
+  <p>[% 'Click on login name to edit!' | $T8 %]</p>
+
+  <p>[% '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 %]</p>
+ </form>
+
+ <form method="post" action="login.pl">
+
+  <div class="listheading">Lx-Office ERP [% 'Login' | $T8 %]</div>
+
+  <table border="0">
+   <tr>
+    <th align="right">[% 'Name' | $T8 %]</th>
+    <td><input class="login" name="login"></td>
+    <td>&nbsp;</td>
+   </tr>
+   <tr>
+    <th align="right">[% 'Password' | $T8 %]</th>
+    <td><input class="login" type="password" name="password"></td>
+    <td><input type="submit" name="action" value="[% 'Login' | $T8 %]"></td>
+   </tr>
+  </table>
+
+ </form>
+
+ <hr size="3" noshade>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/list_users_de.html b/templates/webpages/admin/list_users_de.html
deleted file mode 100644 (file)
index 69388cd..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-[% USE HTML %]<body class="admin" onload="">
-
- <form method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <th class="listtop">Anmeldung</th>
-     <th class="listtop">Name</th>
-     <th class="listtop">Firma</th>
-     <th class="listtop">Treiber</th>
-     <th class="listtop">Datenbankcomputer</th>
-     <th class="listtop">Datenbank</th>
-     <th class="listtop">Vorlagen</th>
-    </tr>
-
-    [% FOREACH row = MEMBERS %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
-      <td>[% HTML.escape(row.name) %]</td>
-      <td>[% HTML.escape(row.company) %]</td>
-      <td>[% HTML.escape(row.dbdriver) %]</td>
-      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
-      <td>[% HTML.escape(row.dbname) %]</td>
-      <td>[% HTML.escape(row.templates) %]</td>
-     </tr>
-    [% END %]
-
-    <td colspan="7"><hr size="3" noshade></td>
-   </table>
-  </p>
-
-
-  <input type="submit" class="submit" name="action" value="Benutzer erfassen">
-  <input type="submit" class="submit" name="action" value="Gruppen bearbeiten">
-  <input type="submit" class="submit" name="action" value="Datenbankadministration">
-  [% IF LOCKED %]
-   <input type="submit" class="submit" name="action" value="System entsperren">
-   [% ELSE %]
-   <input type="submit" class="submit" name="action" value="System sperren">
-  [% END %]
-  <input type="submit" class="submit" name="action" value="Abmelden">
-
-  <p>Zum Bearbeiten den Zugriffsnamen anklicken!</p>
-
-  <p>Um einer Gruppe einen neuen Benutzer hinzuzuf&uuml;gen, passen Sie die Daten eines Benutzers an, und drücken Sie "als neu speichern". Unter dem neuen Namen wird dann ein Benutzer mit denselben Gruppenrechten angelegt.</p>
- </form>
-
- <form method="post" action="login.pl">
-
-  <div class="listheading">Lx-Office ERP Anmeldung</div>
-
-  <table border="0">
-   <tr>
-    <th align="right">Name</th>
-    <td><input class="login" name="login"></td>
-    <td>&nbsp;</td>
-   </tr>
-   <tr>
-    <th align="right">Passwort</th>
-    <td><input class="login" type="password" name="password"></td>
-    <td><input type="submit" name="action" value="Anmeldung"></td>
-   </tr>
-  </table>
-
- </form>
-
- <hr size="3" noshade>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/list_users_en.html b/templates/webpages/admin/list_users_en.html
deleted file mode 100644 (file)
index b8c7bb3..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-[% USE HTML %]<body class="admin" onload="">
-
- <form method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <th class="listtop">Login</th>
-     <th class="listtop">Name</th>
-     <th class="listtop">Company</th>
-     <th class="listtop">Driver</th>
-     <th class="listtop">Host</th>
-     <th class="listtop">Dataset</th>
-     <th class="listtop">Templates</th>
-    </tr>
-
-    [% FOREACH row = MEMBERS %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
-      <td>[% HTML.escape(row.name) %]</td>
-      <td>[% HTML.escape(row.company) %]</td>
-      <td>[% HTML.escape(row.dbdriver) %]</td>
-      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
-      <td>[% HTML.escape(row.dbname) %]</td>
-      <td>[% HTML.escape(row.templates) %]</td>
-     </tr>
-    [% END %]
-
-    <td colspan="7"><hr size="3" noshade></td>
-   </table>
-  </p>
-
-
-  <input type="submit" class="submit" name="action" value="Add User">
-  <input type="submit" class="submit" name="action" value="Edit groups">
-  <input type="submit" class="submit" name="action" value="Pg Database Administration">
-  [% IF LOCKED %]
-   <input type="submit" class="submit" name="action" value="Unlock System">
-   [% ELSE %]
-   <input type="submit" class="submit" name="action" value="Lock System">
-  [% END %]
-  <input type="submit" class="submit" name="action" value="Logout">
-
-  <p>Click on login name to edit!</p>
-
-  <p>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.</p>
- </form>
-
- <form method="post" action="login.pl">
-
-  <div class="listheading">Lx-Office ERP Login</div>
-
-  <table border="0">
-   <tr>
-    <th align="right">Name</th>
-    <td><input class="login" name="login"></td>
-    <td>&nbsp;</td>
-   </tr>
-   <tr>
-    <th align="right">Password</th>
-    <td><input class="login" type="password" name="password"></td>
-    <td><input type="submit" name="action" value="Login"></td>
-   </tr>
-  </table>
-
- </form>
-
- <hr size="3" noshade>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html
deleted file mode 100644 (file)
index fca83aa..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-[% USE HTML %]<body class="admin" onload="">
-
- <form method="post" action="admin.pl">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <th class="listtop"><translate>Login</translate></th>
-     <th class="listtop"><translate>Name</translate></th>
-     <th class="listtop"><translate>Company</translate></th>
-     <th class="listtop"><translate>Driver</translate></th>
-     <th class="listtop"><translate>Host</translate></th>
-     <th class="listtop"><translate>Dataset</translate></th>
-     <th class="listtop"><translate>Templates</translate></th>
-    </tr>
-
-    [% FOREACH row = MEMBERS %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
-      <td>[% HTML.escape(row.name) %]</td>
-      <td>[% HTML.escape(row.company) %]</td>
-      <td>[% HTML.escape(row.dbdriver) %]</td>
-      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
-      <td>[% HTML.escape(row.dbname) %]</td>
-      <td>[% HTML.escape(row.templates) %]</td>
-     </tr>
-    [% END %]
-
-    <td colspan="7"><hr size="3" noshade></td>
-   </table>
-  </p>
-
-
-  <input type="submit" class="submit" name="action" value="<translate>Add User</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>Edit groups</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>Pg Database Administration</translate>">
-  [% IF LOCKED %]
-   <input type="submit" class="submit" name="action" value="<translate>Unlock System</translate>">
-   [% ELSE %]
-   <input type="submit" class="submit" name="action" value="<translate>Lock System</translate>">
-  [% END %]
-  <input type="submit" class="submit" name="action" value="<translate>Logout</translate>">
-
-  <p><translate>Click on login name to edit!</translate></p>
-
-  <p><translate>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.</translate></p>
- </form>
-
- <form method="post" action="login.pl">
-
-  <div class="listheading">Lx-Office ERP <translate>Login</translate></div>
-
-  <table border="0">
-   <tr>
-    <th align="right"><translate>Name</translate></th>
-    <td><input class="login" name="login"></td>
-    <td>&nbsp;</td>
-   </tr>
-   <tr>
-    <th align="right"><translate>Password</translate></th>
-    <td><input class="login" type="password" name="password"></td>
-    <td><input type="submit" name="action" value="<translate>Login</translate>"></td>
-   </tr>
-  </table>
-
- </form>
-
- <hr size="3" noshade>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset.html b/templates/webpages/admin/restore_dataset.html
new file mode 100644 (file)
index 0000000..ab7a94b
--- /dev/null
@@ -0,0 +1,58 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
+
+ <h2>[% title %]</h2>
+
+ <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
+
+  <input type="hidden" name="dbdriver" value="Pg">
+  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
+
+  <p>
+   [% '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 &quot;Create Dataset&quot;.' | $T8 %]
+  </p>
+
+  <p>
+   [%- 'The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.' | $T8 %]
+   [%- 'It may optionally be compressed with &quot;gzip&quot;.' | $T8 %]
+   [%- 'Files created by Lx-Office\'s &quot;Backup Dataset&quot; function are such files.' | $T8 %]
+  </p>
+
+  <table>
+   <tr>
+    <td valign="top">[% 'Dataset name' | $T8 %]</td>
+    <td valign="top"><input name="new_dbname"></td>
+   </tr>
+
+   <tr>
+    <th valign="top">[% 'Multibyte Encoding' | $T8 %]</th>
+    <td>
+     <select name="dbencoding">
+      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td valign="top">[% 'Backup file' | $T8 %]</td>
+    <td valign="top"><input type="file" accept="*" name="content"></td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="nextsub" value="restore_dataset_start">
+
+  <hr size="3" noshade>
+
+  <br>
+
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/restore_dataset_de.html b/templates/webpages/admin/restore_dataset_de.html
deleted file mode 100644 (file)
index 28e0d2d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
-
- <h2>[% title %]</h2>
-
- <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
-
-  <input type="hidden" name="dbdriver" value="Pg">
-  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-  <p>
-   Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen.
-   Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.
-   Sie k&ouml;nnen eine fehlende Datenbank erstellen, indem Sie jetzt zu&uuml;ck gehen und den Punkt &quot;Datenbank anlegen&quot; w&auml;hlen.
-  </p>
-
-  <p>
-   Die von Ihnen hochzuladende Sicherungsdatei muss mit dem Programm und den Parametern &quot;pg_dump -o -Ft&quot; erstellt worden sein.
-   Sie darf optional mit &quot;gzip&quot; komprimiert sein.
-   Dateien, die von Lx-Office' Funktion &quot;Datenbank sichern&quot; erstellt wurden, erf&uuml;llen diese Kriterien.
-  </p>
-
-  <table>
-   <tr>
-    <td valign="top">Datenbankname</td>
-    <td valign="top"><input name="new_dbname"></td>
-   </tr>
-
-   <tr>
-    <th valign="top">Schriftsatz</th>
-    <td>
-     <select name="dbencoding">
-      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td valign="top">Sicherungsdatei</td>
-    <td valign="top"><input type="file" accept="*" name="content"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="restore_dataset_start">
-
-  <hr size="3" noshade>
-
-  <br>
-
-  <input type="submit" class="submit" name="action" value="Weiter">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset_en.html b/templates/webpages/admin/restore_dataset_en.html
deleted file mode 100644 (file)
index cd02e73..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
-
- <h2>[% title %]</h2>
-
- <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
-
-  <input type="hidden" name="dbdriver" value="Pg">
-  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-  <p>
-   Please enter the name of the dataset you want to restore the backup in.
-   The dataset has to exist before a restoration can be started.
-   You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.
-  </p>
-
-  <p>
-   The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.
-   It may optionally be compressed with &quot;gzip&quot;.
-   Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.
-  </p>
-
-  <table>
-   <tr>
-    <td valign="top">Dataset name</td>
-    <td valign="top"><input name="new_dbname"></td>
-   </tr>
-
-   <tr>
-    <th valign="top">Multibyte Encoding</th>
-    <td>
-     <select name="dbencoding">
-      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td valign="top">Backup file</td>
-    <td valign="top"><input type="file" accept="*" name="content"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="restore_dataset_start">
-
-  <hr size="3" noshade>
-
-  <br>
-
-  <input type="submit" class="submit" name="action" value="Continue">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html
deleted file mode 100644 (file)
index a160272..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
-
- <h2>[% title %]</h2>
-
- <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
-
-  <input type="hidden" name="dbdriver" value="Pg">
-  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
-  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
-  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
-  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
-
-  <p>
-   <translate>Please enter the name of the dataset you want to restore the backup in.</translate>
-   <translate>The dataset has to exist before a restoration can be started.</translate>
-   <translate>You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.</translate>
-  </p>
-
-  <p>
-   <translate>The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.</translate>
-   <translate>It may optionally be compressed with &quot;gzip&quot;.</translate>
-   <translate>Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.</translate>
-  </p>
-
-  <table>
-   <tr>
-    <td valign="top"><translate>Dataset name</translate></td>
-    <td valign="top"><input name="new_dbname"></td>
-   </tr>
-
-   <tr>
-    <th valign="top"><translate>Multibyte Encoding</translate></th>
-    <td>
-     <select name="dbencoding">
-      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td valign="top"><translate>Backup file</translate></td>
-    <td valign="top"><input type="file" accept="*" name="content"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="restore_dataset_start">
-
-  <hr size="3" noshade>
-
-  <br>
-
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset_start_footer.html b/templates/webpages/admin/restore_dataset_start_footer.html
new file mode 100644 (file)
index 0000000..0143fb4
--- /dev/null
@@ -0,0 +1,17 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %] </pre>
+
+ <hr>
+
+ <p>
+  [%- 'The restoration process is complete. Please review &quot;pg_restore&quot;\'s output to find out if the restoration was successful.' | $T8 %]
+  [%- LxERP.t8('The program\'s exit code was #1 (&quot;0&quot; usually means that everything went OK).', retval) | html %]
+ </p>
+
+ <form method="post" action="admin.pl">
+  <input type="hidden" name="nextsub" value="list_users">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/admin/restore_dataset_start_footer_de.html b/templates/webpages/admin/restore_dataset_start_footer_de.html
deleted file mode 100644 (file)
index 2485438..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %] </pre>
-
- <hr>
-
- <p>
-  Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von &quot;pg_restore&quot; an, um festzustellen, ob die Wiederherstellung erfolgreich war.
-  Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).
- </p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Weiter">
- </form>
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset_start_footer_en.html b/templates/webpages/admin/restore_dataset_start_footer_en.html
deleted file mode 100644 (file)
index 9cbf151..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %] </pre>
-
- <hr>
-
- <p>
-  The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.
-  The program's exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).
- </p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Continue">
- </form>
-</body>
-</html>
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 (file)
index da55e2d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %] </pre>
-
- <hr>
-
- <p>
-  <translate>The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.</translate>
-  <translate>The program's exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).</translate>
- </p>
-
- <form method="post" action="admin.pl">
-  <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="<translate>Continue</translate>">
- </form>
-</body>
-</html>
diff --git a/templates/webpages/admin/restore_dataset_start_header.html b/templates/webpages/admin/restore_dataset_start_header.html
new file mode 100644 (file)
index 0000000..ede5e7c
--- /dev/null
@@ -0,0 +1,10 @@
+[%- USE T8 %]
+<body class="admin">
+
+ <h2>[% title %]</h2>
+
+ <p>[%- 'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
+
+ <hr>
+
+ <pre>
diff --git a/templates/webpages/admin/restore_dataset_start_header_de.html b/templates/webpages/admin/restore_dataset_start_header_de.html
deleted file mode 100644 (file)
index e340559..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p>Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:</p>
-
- <hr>
-
- <pre>
diff --git a/templates/webpages/admin/restore_dataset_start_header_en.html b/templates/webpages/admin/restore_dataset_start_header_en.html
deleted file mode 100644 (file)
index b1589e2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p>The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:</p>
-
- <hr>
-
- <pre>
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 (file)
index accca00..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<body class="admin">
-
- <h2>[% title %]</h2>
-
- <p><translate>The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:</translate></p>
-
- <hr>
-
- <pre>
diff --git a/templates/webpages/admin/test_db_connection.html b/templates/webpages/admin/test_db_connection.html
new file mode 100644 (file)
index 0000000..865efea
--- /dev/null
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ [%- IF connection_ok %]
+
+ <p>[% 'The connection was established successfully.' | $T8 %]</p>
+
+ [%- ELSE %]
+
+ <p>
+  [% 'The connection to the database could not be established.' | $T8 %]
+  [% 'Error message from the database driver:' | $T8 %]
+ </p>
+
+ <p>[% HTML.escape(errstr) %]</p>
+
+ [%- END %]
+
+ <p>
+  <form>
+   <input type="button" class="submit" onclick="window.close()" value="[% 'Close Window' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/test_db_connection_de.html b/templates/webpages/admin/test_db_connection_de.html
deleted file mode 100644 (file)
index ced5658..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- [%- IF connection_ok %]
-
- <p>Die Verbindung zur Datenbank wurde erfolgreich hergestellt.</p>
-
- [%- ELSE %]
-
- <p>
-  Die Verbindung zur Datenbank konnte nicht hergestellt werden.
-  Fehlermeldung des Datenbanktreibers:
- </p>
-
- <p>[% HTML.escape(errstr) %]</p>
-
- [%- END %]
-
- <p>
-  <form>
-   <input type="button" class="submit" onclick="window.close()" value="Fenster Schlie&szlig;en">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/test_db_connection_en.html b/templates/webpages/admin/test_db_connection_en.html
deleted file mode 100644 (file)
index 4047457..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- [%- IF connection_ok %]
-
- <p>The connection was established successfully.</p>
-
- [%- ELSE %]
-
- <p>
-  The connection to the database could not be established.
-  Error message from the database driver:
- </p>
-
- <p>[% HTML.escape(errstr) %]</p>
-
- [%- END %]
-
- <p>
-  <form>
-   <input type="button" class="submit" onclick="window.close()" value="Close Window">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/test_db_connection_master.html b/templates/webpages/admin/test_db_connection_master.html
deleted file mode 100644 (file)
index 25dedac..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- [%- IF connection_ok %]
-
- <p><translate>The connection was established successfully.</translate></p>
-
- [%- ELSE %]
-
- <p>
-  <translate>The connection to the database could not be
-   established.</translate>
-  <translate>Error message from the database driver:</translate>
- </p>
-
- <p>[% HTML.escape(errstr) %]</p>
-
- [%- END %]
-
- <p>
-  <form>
-   <input type="button" class="submit" onclick="window.close()" value="<translate>Close Window</translate>">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/update_dataset.html b/templates/webpages/admin/update_dataset.html
new file mode 100644 (file)
index 0000000..8d32086
--- /dev/null
@@ -0,0 +1,57 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="admin">
+
+ <h2>[% title %]</h2>
+
+ [% IF ALL_UPDATED %]
+  [% 'All Datasets up to date!' | $T8 %]
+
+  [% ELSE %]
+
+  <form method="post" action="admin.pl">
+
+   <p>[% 'The following Datasets need to be updated' | $T8 %]:</p>
+
+   <table>
+    <tr>
+     <th class="listtop">[% 'Update?' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Port' | $T8 %]</th>
+     <th class="listtop">[% 'User' | $T8 %]</th>
+    </tr>
+
+    [% FOREACH row = NEED_UPDATES %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
+      <td>
+       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
+       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
+      </td>
+      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
+      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
+      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
+      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
+     </tr>
+
+    [% END %]
+   </table>
+
+   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
+
+   <input name="callback" type="hidden" value="admin.pl?action=list_users">
+   <input type="hidden" name="nextsub" value="dbupdate">
+
+   <hr size="3" noshade>
+
+   <br>
+
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+
+  </form>
+
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/admin/update_dataset_de.html b/templates/webpages/admin/update_dataset_de.html
deleted file mode 100644 (file)
index cf286c5..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- [% IF ALL_UPDATED %]
-  Alle Datenbanken sind auf aktuellem Stand.
-
-  [% ELSE %]
-
-  <form method="post" action="admin.pl">
-
-   <p>Folgende Datenbanken müssen aktualisiert werden:</p>
-
-   <table>
-    <tr>
-     <th class="listtop">Aktualisieren?</th>
-     <th class="listtop">Datenbank</th>
-     <th class="listtop">Treiber</th>
-     <th class="listtop">Datenbankcomputer</th>
-     <th class="listtop">Port</th>
-     <th class="listtop">Benutzer</th>
-    </tr>
-
-    [% FOREACH row = NEED_UPDATES %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
-      <td>
-       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
-       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
-      </td>
-      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
-      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
-      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
-      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
-     </tr>
-
-    [% END %]
-   </table>
-
-   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="dbupdate">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="Weiter">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/update_dataset_en.html b/templates/webpages/admin/update_dataset_en.html
deleted file mode 100644 (file)
index 764323c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- [% IF ALL_UPDATED %]
-  All Datasets up to date!
-
-  [% ELSE %]
-
-  <form method="post" action="admin.pl">
-
-   <p>The following Datasets need to be updated:</p>
-
-   <table>
-    <tr>
-     <th class="listtop">Update?</th>
-     <th class="listtop">Dataset</th>
-     <th class="listtop">Driver</th>
-     <th class="listtop">Host</th>
-     <th class="listtop">Port</th>
-     <th class="listtop">User</th>
-    </tr>
-
-    [% FOREACH row = NEED_UPDATES %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
-      <td>
-       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
-       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
-      </td>
-      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
-      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
-      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
-      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
-     </tr>
-
-    [% END %]
-   </table>
-
-   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="dbupdate">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="Continue">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html
deleted file mode 100644 (file)
index 268cf87..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-[% USE HTML %]<body class="admin">
-
- <h2>[% title %]</h2>
-
- [% IF ALL_UPDATED %]
-  <translate>All Datasets up to date!</translate>
-
-  [% ELSE %]
-
-  <form method="post" action="admin.pl">
-
-   <p><translate>The following Datasets need to be updated</translate>:</p>
-
-   <table>
-    <tr>
-     <th class="listtop"><translate>Update?</translate></th>
-     <th class="listtop"><translate>Dataset</translate></th>
-     <th class="listtop"><translate>Driver</translate></th>
-     <th class="listtop"><translate>Host</translate></th>
-     <th class="listtop"><translate>Port</translate></th>
-     <th class="listtop"><translate>User</translate></th>
-    </tr>
-
-    [% FOREACH row = NEED_UPDATES %]
-     <tr class="listrow[% loop.count % 2 %]">
-      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
-      <td>
-       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
-       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
-      </td>
-      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
-      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
-      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
-      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
-     </tr>
-
-    [% END %]
-   </table>
-
-   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
-
-   <input name="callback" type="hidden" value="admin.pl?action=list_users">
-   <input type="hidden" name="nextsub" value="dbupdate">
-
-   <hr size="3" noshade>
-
-   <br>
-
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-
-  </form>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration.html b/templates/webpages/admin/user_migration.html
new file mode 100644 (file)
index 0000000..ef34e55
--- /dev/null
@@ -0,0 +1,26 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="admin.pl">
+
+  <p>
+   [% LxERP.t8('The old file containing the user information is still present (&quot;#1&quot;). 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 %]
+  </p>
+
+  <p>
+   [% 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 &quot;#1&quot;.', backupdir) | html %]
+  </p>
+
+  <input type="hidden" name="yes_nextsub" value="migrate_users">
+  <input type="hidden" name="no_nextsub" value="list_users">
+
+  <input type="submit" class="submit" name="action" value="[% 'Yes' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'No' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/user_migration_complete.html b/templates/webpages/admin/user_migration_complete.html
new file mode 100644 (file)
index 0000000..5f5114c
--- /dev/null
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="admin.pl">
+
+  [%- IF standard_group_created %]
+  <p>[% 'A group named &quot;Full Access&quot; has been created.' | $T8 %]</p>
+  [%- END %]
+
+
+  <p>[% 'The user migration process is complete.' | $T8 %]
+   [% 'You will now be forwarded to the administration panel.' | $T8 %]</p>
+
+  <input type="hidden" name="nextsub" value="list_users">
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/user_migration_complete_de.html b/templates/webpages/admin/user_migration_complete_de.html
deleted file mode 100644 (file)
index 29257b8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  [%- IF standard_group_created %]
-  <p>Eine Gruppe namens &quot;Vollzugriff&quot; wurde angelegt.</p>
-  [%- END %]
-
-
-  <p>Der Prozess der Benutzerdatenmigration ist abgeschlossen.
-   Sie werden nun zum Administrationsbereich weitergeleitet.</p>
-
-  <input type="hidden" name="nextsub" value="list_users">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_complete_en.html b/templates/webpages/admin/user_migration_complete_en.html
deleted file mode 100644 (file)
index a4bf351..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  [%- IF standard_group_created %]
-  <p>A group named &quot;Full Access&quot; has been created.</p>
-  [%- END %]
-
-
-  <p>The user migration process is complete.
-   You will now be forwarded to the administration panel.</p>
-
-  <input type="hidden" name="nextsub" value="list_users">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_complete_master.html b/templates/webpages/admin/user_migration_complete_master.html
deleted file mode 100644 (file)
index dcf0eb8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  [%- IF standard_group_created %]
-  <p><translate>A group named &quot;Full Access&quot; has been
-    created.</translate></p>
-  [%- END %]
-
-
-  <p><translate>The user migration process is complete.</translate>
-   <translate>You will now be forwarded to the administration
-   panel.</translate></p>
-
-  <input type="hidden" name="nextsub" value="list_users">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_de.html b/templates/webpages/admin/user_migration_de.html
deleted file mode 100644 (file)
index c57f83d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;[% HTML.escape(memberfile) %]&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden k&ouml;nnen.
-  </p>
-
-  <p>
-   Falls Sie sich entscheiden, Lx-Office die Migration durchf&uuml;hren zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis &quot;[% HTML.escape(backupdir) %]&quot; erstellen und die Dateien anschlie&szlig;end l&ouml;schen.
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="migrate_users">
-  <input type="hidden" name="no_nextsub" value="list_users">
-
-  <input type="submit" class="submit" name="action" value="Ja">
-  <input type="submit" class="submit" name="action" value="Nein">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_done.html b/templates/webpages/admin/user_migration_done.html
new file mode 100644 (file)
index 0000000..c20263c
--- /dev/null
@@ -0,0 +1,19 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="admin.pl">
+
+  <p>[% 'The following users have been migrated into the authentication database:' | $T8 %]</p>
+
+  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
+
+  <input type="hidden" name="nextsub" value="create_standard_group_ask">
+
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/user_migration_done_de.html b/templates/webpages/admin/user_migration_done_de.html
deleted file mode 100644 (file)
index 286248a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>Die folgenden Benutzer wurden in die Authentifizierungsdatenbank migriert:</p>
-
-  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
-
-  <input type="hidden" name="nextsub" value="create_standard_group_ask">
-
-  <input type="submit" class="submit" name="action" value="Weiter">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_done_en.html b/templates/webpages/admin/user_migration_done_en.html
deleted file mode 100644 (file)
index 07e669d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>The following users have been migrated into the authentication database:</p>
-
-  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
-
-  <input type="hidden" name="nextsub" value="create_standard_group_ask">
-
-  <input type="submit" class="submit" name="action" value="Continue">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_done_master.html b/templates/webpages/admin/user_migration_done_master.html
deleted file mode 100644 (file)
index dd7b32a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p><translate>The following users have been migrated into the
-    authentication database:</translate></p>
-
-  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
-
-  <input type="hidden" name="nextsub" value="create_standard_group_ask">
-
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_en.html b/templates/webpages/admin/user_migration_en.html
deleted file mode 100644 (file)
index f970e1a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   The old file containing the user information is still present (&quot;[% HTML.escape(memberfile) %]&quot;). 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. 
-  </p>
-
-  <p>
-   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 &quot;[% HTML.escape(backupdir) %]&quot;.
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="migrate_users">
-  <input type="hidden" name="no_nextsub" value="list_users">
-
-  <input type="submit" class="submit" name="action" value="Yes">
-  <input type="submit" class="submit" name="action" value="No">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/admin/user_migration_master.html b/templates/webpages/admin/user_migration_master.html
deleted file mode 100644 (file)
index b9f5d4d..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="admin.pl">
-
-  <p>
-   <translate>The old file containing the user information is still
-    present (&quot;[% HTML.escape(memberfile) %]&quot;). 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.
-   </translate>
-  </p>
-
-  <p>
-   <translate>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
-    &quot;[% HTML.escape(backupdir) %]&quot;.</translate>
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="migrate_users">
-  <input type="hidden" name="no_nextsub" value="list_users">
-
-  <input type="submit" class="submit" name="action" value="<translate>Yes</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>No</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
new file mode 100644 (file)
index 0000000..280db9d
--- /dev/null
@@ -0,0 +1,274 @@
+[%- USE T8 %]
+[% USE HTML %]<body onLoad="fokus()">
+
+ <p>
+  <div class="listtop">[% title %]</div>
+ </p>
+
+ <form method="post" action="am.pl" name="Form">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
+   <li><a href="#" rel="page_display_options">[% 'Display options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_print_options">[% 'Print options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
+  </ul>
+
+  <input type="hidden" name="type" value="preferences">
+  <input type="hidden" name="role" value="[% HTML.escape(myconfig_role) %]">
+
+  <div class="tabcontentstyle">
+
+   <div id="page_personal_settings" class="tabcontent">
+
+    <table>
+     <tr>
+      <th align="right">[% 'Name' | $T8 %]</th>
+      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Password' | $T8 %]</th>
+      <td>
+       [%- IF CAN_CHANGE_PASSWORD %]
+       <input type="password" name="new_password" size="10" value="********">
+       [%- ELSE %]
+       <input type="hidden" name="new_password" value="********">
+       [%- END %]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'E-mail' | $T8 %]</th>
+      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
+     </tr>
+
+     <tr valign="top">
+      <th align="right">[% 'Signature' | $T8 %]</th>
+      <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Phone' | $T8 %]</th>
+      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Fax' | $T8 %]</th>
+      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Company' | $T8 %]</th>
+      <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
+     </tr>
+     <tr valign="top">
+      <th align="right">[% 'Address' | $T8 %]</th>
+      <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="page_display_options" class="tabcontent">
+
+    <table>
+     <tr>
+      <th align="right">[% 'Date Format' | $T8 %]</th>
+      <td>
+       <select name="dateformat">
+        [%- FOREACH row = DATEFORMATS %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Output Number Format' | $T8 %]</th>
+      <td>
+       <select name="numberformat">
+        [%- FOREACH row = NUMBERFORMATS %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
+      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Language' | $T8 %]</th>
+      <td>
+       <select name="countrycode">
+        [%- FOREACH row = COUNTRYCODES %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Stylesheet' | $T8 %]</th>
+      <td>
+       <select name="usestylesheet">
+        [%- FOREACH row = STYLESHEETS %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Setup Menu' | $T8 %]</th>
+      <td>
+       <select name="menustyle">
+        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+       </select>
+      </td>
+     </tr>
+
+     <tr valign="top">
+      <th align="right">[% 'Favorites' | $T8 %]</th>
+      <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Form details (second row)' | $T8 %]</th>
+      <td>
+       <select name="show_form_details">
+        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
+      <td>
+       <select name="hide_cvar_search_options">
+        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+       </select>
+      </td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="page_print_options" class="tabcontent">
+
+    <table>
+     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
+
+     <tr>
+      <th align="right">[% 'Default template format' | $T8 %]</th>
+      <td>
+       <select name="template_format">
+        [%- FOREACH row = TEMPLATE_FORMATS %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Default output medium' | $T8 %]</th>
+      <td>
+       <select name="default_media">
+        [%- FOREACH row = MEDIA %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Default printer' | $T8 %]</th>
+      <td>
+       <select name="default_printer_id">
+        [%- FOREACH row = PRINTERS %]
+        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+        [%- END %]
+       </select>
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Number of copies' | $T8 %]</th>
+      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="page_todo_list_options" class="tabcontent">
+
+    <table>
+     <tr>
+      <th align="right">[% 'Show your TODO list after loggin in' | $T8 %]</th>
+      <td colspan="2">
+       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
+       <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
+       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
+       <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
+      </td>
+     </tr>
+
+     <tr class="listheading">
+      <th colspan="3">[% 'Configuration of individual TODO items' | $T8 %]</th>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Show follow ups...' | $T8 %]</th>
+      <td>
+       <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
+       <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label>
+      </td>
+      <td>
+       <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
+       <label for="todo_cfg_show_follow_ups_login">[% '...after loggin in' | $T8 %]</label>
+      </td>
+     </tr>
+
+     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
+     <tr>
+      <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
+      <td>
+       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
+       <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label>
+      </td>
+      <td>
+       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
+       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after loggin in' | $T8 %]</label>
+      </td>
+     </tr>
+     [%- END %]
+    </table>
+
+    <br style="clear: left" />
+   </div>
+  </div>
+
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      var maintab = new ddtabcontent("maintab");
+      maintab.setpersist(true);
+      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
+      maintab.init();
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html
deleted file mode 100644 (file)
index f064f8d..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[% USE HTML %]<body onLoad="fokus()">
-
- <p>
-  <div class="listtop">[% title %]</div>
- </p>
-
- <form method="post" action="am.pl" name="Form">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="page_personal_settings">Pers&ouml;nliche Einstellungen</a></li>
-   <li><a href="#" rel="page_display_options">Anzeigeoptionen</a></li>
-   <li><a href="#" rel="page_print_options">Druckoptionen</a></li>
-   <li><a href="#" rel="page_todo_list_options">Aufgabenlistenoptionen</a></li>
-  </ul>
-
-  <input type="hidden" name="type" value="preferences">
-  <input type="hidden" name="role" value="[% HTML.escape(myconfig_role) %]">
-
-  <div class="tabcontentstyle">
-
-   <div id="page_personal_settings" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Name</th>
-      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Passwort</th>
-      <td>
-       [%- IF CAN_CHANGE_PASSWORD %]
-       <input type="password" name="new_password" size="10" value="********">
-       [%- ELSE %]
-       <input type="hidden" name="new_password" value="********">
-       [%- END %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">eMail</th>
-      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right">Unterschrift</th>
-      <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right">Telefon</th>
-      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Fax</th>
-      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
-     </tr>
-     <tr>
-      <th align="right">Firma</th>
-      <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
-     </tr>
-     <tr valign="top">
-      <th align="right">Adresse</th>
-      <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_display_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Datumsformat</th>
-      <td>
-       <select name="dateformat">
-        [%- FOREACH row = DATEFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-     <tr>
-      <th align="right">Zahlenformat (Ausgabe)</th>
-      <td>
-       <select name="numberformat">
-        [%- FOREACH row = NUMBERFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Auswahllistenbegrenzung</th>
-      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Sprache</th>
-      <td>
-       <select name="countrycode">
-        [%- FOREACH row = COUNTRYCODES %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Stilvorlage</th>
-      <td>
-       <select name="usestylesheet">
-        [%- FOREACH row = STYLESHEETS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Menüsetup</th>
-      <td>
-       <select name="menustyle">
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>Oben (mit CSS)</option>
-        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>Oben (mit CSS, neu)</option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>Oben (mit Javascript)</option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>Oben (XUL; nur f&uuml;r Mozilla Firefox)</option>
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>Alt (seitlich)</option>
-       </select>
-      </td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right">Favoriten</th>
-      <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right">Formulardetails (zweite Positionszeile)</th>
-      <td>
-       <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>Standardm&auml;&szlig;ig anzeigen</option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>Standardm&auml;&szlig;ig verstecken</option>
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Suchoptionen für Benutzerdefinierte Variablen verstecken</th>
-      <td>
-       <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>Standardm&auml;&szlig;ig anzeigen</option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>Standardm&auml;&szlig;ig verstecken</option>
-       </select>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_print_options" class="tabcontent">
-
-    <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
-
-     <tr>
-      <th align="right">Standardvorlagenformat</th>
-      <td>
-       <select name="template_format">
-        [%- FOREACH row = TEMPLATE_FORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Standardausgabekanal</th>
-      <td>
-       <select name="default_media">
-        [%- FOREACH row = MEDIA %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Standarddrucker</th>
-      <td>
-       <select name="default_printer_id">
-        [%- FOREACH row = PRINTERS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Anzahl Kopien</th>
-      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_todo_list_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Aufgabenliste nach dem Anmelden anzeigen</th>
-      <td colspan="2">
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1">Ja</label>
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0">Nein</label>
-      </td>
-     </tr>
-
-     <tr class="listheading">
-      <th colspan="3">Konfiguration f&uuml;r die einzelnen Aufgabenlistenpunkte</th>
-     </tr>
-
-     <tr>
-      <th align="right">Zeige Wiedervorlagen...</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups">...auf der Aufgabenliste</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login">...nach dem Anmelden</label>
-      </td>
-     </tr>
-
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
-     <tr>
-      <th align="right">Überfällige Angebote und Preisanfragen anzeigen...</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations">...auf der Aufgabenliste</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login">...nach dem Anmelden</label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-  </div>
-
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/am/config_en.html b/templates/webpages/am/config_en.html
deleted file mode 100644 (file)
index cd66d9d..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[% USE HTML %]<body onLoad="fokus()">
-
- <p>
-  <div class="listtop">[% title %]</div>
- </p>
-
- <form method="post" action="am.pl" name="Form">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="page_personal_settings">Personal settings</a></li>
-   <li><a href="#" rel="page_display_options">Display options</a></li>
-   <li><a href="#" rel="page_print_options">Print options</a></li>
-   <li><a href="#" rel="page_todo_list_options">TODO list options</a></li>
-  </ul>
-
-  <input type="hidden" name="type" value="preferences">
-  <input type="hidden" name="role" value="[% HTML.escape(myconfig_role) %]">
-
-  <div class="tabcontentstyle">
-
-   <div id="page_personal_settings" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Name</th>
-      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Password</th>
-      <td>
-       [%- IF CAN_CHANGE_PASSWORD %]
-       <input type="password" name="new_password" size="10" value="********">
-       [%- ELSE %]
-       <input type="hidden" name="new_password" value="********">
-       [%- END %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">E-mail</th>
-      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right">Signature</th>
-      <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right">Phone</th>
-      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Fax</th>
-      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
-     </tr>
-     <tr>
-      <th align="right">Company</th>
-      <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
-     </tr>
-     <tr valign="top">
-      <th align="right">Address</th>
-      <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_display_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Date Format</th>
-      <td>
-       <select name="dateformat">
-        [%- FOREACH row = DATEFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-     <tr>
-      <th align="right">Output Number Format</th>
-      <td>
-       <select name="numberformat">
-        [%- FOREACH row = NUMBERFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Dropdown Limit</th>
-      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Language</th>
-      <td>
-       <select name="countrycode">
-        [%- FOREACH row = COUNTRYCODES %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Stylesheet</th>
-      <td>
-       <select name="usestylesheet">
-        [%- FOREACH row = STYLESHEETS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Setup Menu</th>
-      <td>
-       <select name="menustyle">
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>Top (CSS)</option>
-        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>Top (CSS) new</option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>Top (Javascript)</option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>Top (XUL; only for Mozilla Firefox)</option>
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>Old (on the side)</option>
-       </select>
-      </td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right">Favorites</th>
-      <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right">Form details (second row)</th>
-      <td>
-       <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>Show by default</option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>Hide by default</option>
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Show custom variable search inputs</th>
-      <td>
-       <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>Show by default</option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>Hide by default</option>
-       </select>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_print_options" class="tabcontent">
-
-    <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
-
-     <tr>
-      <th align="right">Default template format</th>
-      <td>
-       <select name="template_format">
-        [%- FOREACH row = TEMPLATE_FORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Default output medium</th>
-      <td>
-       <select name="default_media">
-        [%- FOREACH row = MEDIA %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Default printer</th>
-      <td>
-       <select name="default_printer_id">
-        [%- FOREACH row = PRINTERS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">Number of copies</th>
-      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_todo_list_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Show your TODO list after loggin in</th>
-      <td colspan="2">
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1">Yes</label>
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0">No</label>
-      </td>
-     </tr>
-
-     <tr class="listheading">
-      <th colspan="3">Configuration of individual TODO items</th>
-     </tr>
-
-     <tr>
-      <th align="right">Show follow ups...</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups">...on the TODO list</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login">...after loggin in</label>
-      </td>
-     </tr>
-
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
-     <tr>
-      <th align="right">Show overdue sales quotations and requests for quotations...</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations">...on the TODO list</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login">...after loggin in</label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-  </div>
-
-  <p><input type="submit" class="submit" name="action" value="Save"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
deleted file mode 100644 (file)
index e24919e..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[% USE HTML %]<body onLoad="fokus()">
-
- <p>
-  <div class="listtop">[% title %]</div>
- </p>
-
- <form method="post" action="am.pl" name="Form">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="page_personal_settings"><translate>Personal settings</translate></a></li>
-   <li><a href="#" rel="page_display_options"><translate>Display options</translate></a></li>
-   <li><a href="#" rel="page_print_options"><translate>Print options</translate></a></li>
-   <li><a href="#" rel="page_todo_list_options"><translate>TODO list options</translate></a></li>
-  </ul>
-
-  <input type="hidden" name="type" value="preferences">
-  <input type="hidden" name="role" value="[% HTML.escape(myconfig_role) %]">
-
-  <div class="tabcontentstyle">
-
-   <div id="page_personal_settings" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right"><translate>Name</translate></th>
-      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Password</translate></th>
-      <td>
-       [%- IF CAN_CHANGE_PASSWORD %]
-       <input type="password" name="new_password" size="10" value="********">
-       [%- ELSE %]
-       <input type="hidden" name="new_password" value="********">
-       [%- END %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>E-mail</translate></th>
-      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right"><translate>Signature</translate></th>
-      <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Phone</translate></th>
-      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Fax</translate></th>
-      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
-     </tr>
-     <tr>
-      <th align="right"><translate>Company</translate></th>
-      <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
-     </tr>
-     <tr valign="top">
-      <th align="right"><translate>Address</translate></th>
-      <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_display_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right"><translate>Date Format</translate></th>
-      <td>
-       <select name="dateformat">
-        [%- FOREACH row = DATEFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-     <tr>
-      <th align="right"><translate>Output Number Format</translate></th>
-      <td>
-       <select name="numberformat">
-        [%- FOREACH row = NUMBERFORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Dropdown Limit</translate></th>
-      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Language</translate></th>
-      <td>
-       <select name="countrycode">
-        [%- FOREACH row = COUNTRYCODES %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Stylesheet</translate></th>
-      <td>
-       <select name="usestylesheet">
-        [%- FOREACH row = STYLESHEETS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Setup Menu</translate></th>
-      <td>
-       <select name="menustyle">
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]><translate>Top (CSS)</translate></option>
-        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]><translate>Top (CSS) new</translate></option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]><translate>Top (Javascript)</translate></option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]><translate>Top (XUL; only for Mozilla Firefox)</translate></option>
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]><translate>Old (on the side)</translate></option>
-       </select>
-      </td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right"><translate>Favorites</translate></th>
-      <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Form details (second row)</translate></th>
-      <td>
-       <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]><translate>Show by default</translate></option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]><translate>Hide by default</translate></option>
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Show custom variable search inputs</translate></th>
-      <td>
-       <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]><translate>Show by default</translate></option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]><translate>Hide by default</translate></option>
-       </select>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_print_options" class="tabcontent">
-
-    <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
-
-     <tr>
-      <th align="right"><translate>Default template format</translate></th>
-      <td>
-       <select name="template_format">
-        [%- FOREACH row = TEMPLATE_FORMATS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Default output medium</translate></th>
-      <td>
-       <select name="default_media">
-        [%- FOREACH row = MEDIA %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Default printer</translate></th>
-      <td>
-       <select name="default_printer_id">
-        [%- FOREACH row = PRINTERS %]
-        <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-        [%- END %]
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Number of copies</translate></th>
-      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="page_todo_list_options" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right"><translate>Show your TODO list after loggin in</translate></th>
-      <td colspan="2">
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1"><translate>Yes</translate></label>
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0"><translate>No</translate></label>
-      </td>
-     </tr>
-
-     <tr class="listheading">
-      <th colspan="3"><translate>Configuration of individual TODO items</translate></th>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Show follow ups...</translate></th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups"><translate>...on the TODO list</translate></label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login"><translate>...after loggin in</translate></label>
-      </td>
-     </tr>
-
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
-     <tr>
-      <th align="right"><translate>Show overdue sales quotations and requests for quotations...</translate></th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations"><translate>...on the TODO list</translate></label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login"><translate>...after loggin in</translate></label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-  </div>
-
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/am/confirm_delete_warehouse.html b/templates/webpages/am/confirm_delete_warehouse.html
new file mode 100644 (file)
index 0000000..541b29a
--- /dev/null
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <p>[% 'Do you really want to delete this warehouse?' | $T8 %]</p>
+
+ <p>[% 'Warehouse' | $T8 %]: [% HTML.escape(orig_description) %]</p>
+
+ <form action="am.pl" method="post">
+
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+  <input type="hidden" name="type" value="warehouse">
+  <input type="hidden" name="confirmed" value="1">
+
+  <button type="button" class="submit" onclick="history.back()">[% 'Back' | $T8 %]</button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+ </form>
+
+</body>
+</form>
diff --git a/templates/webpages/am/confirm_delete_warehouse_de.html b/templates/webpages/am/confirm_delete_warehouse_de.html
deleted file mode 100644 (file)
index 6244412..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p>Wollen Sie dieses Lager wirklich l&ouml;schen?</p>
-
- <p>Lager: [% HTML.escape(orig_description) %]</p>
-
- <form action="am.pl" method="post">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="confirmed" value="1">
-
-  <button type="button" class="submit" onclick="history.back()">Zurück</button>
-  <input type="submit" class="submit" name="action" value="Löschen">
- </form>
-
-</body>
-</form>
diff --git a/templates/webpages/am/confirm_delete_warehouse_en.html b/templates/webpages/am/confirm_delete_warehouse_en.html
deleted file mode 100644 (file)
index dba407d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p>Do you really want to delete this warehouse?</p>
-
- <p>Warehouse: [% HTML.escape(orig_description) %]</p>
-
- <form action="am.pl" method="post">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="confirmed" value="1">
-
-  <button type="button" class="submit" onclick="history.back()">Back</button>
-  <input type="submit" class="submit" name="action" value="Delete">
- </form>
-
-</body>
-</form>
diff --git a/templates/webpages/am/confirm_delete_warehouse_master.html b/templates/webpages/am/confirm_delete_warehouse_master.html
deleted file mode 100644 (file)
index 24bec53..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <p><translate>Do you really want to delete this warehouse?</translate></p>
-
- <p><translate>Warehouse</translate>: [% HTML.escape(orig_description) %]</p>
-
- <form action="am.pl" method="post">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="confirmed" value="1">
-
-  <button type="button" class="submit" onclick="history.back()"><translate>Back</translate></button>
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
- </form>
-
-</body>
-</form>
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
new file mode 100644 (file)
index 0000000..6ccb7a2
--- /dev/null
@@ -0,0 +1,213 @@
+[%- USE T8 %]
+[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
+/****************************************************
+* Form Dependency Manager- By Twey- http://www.twey.co.uk
+* Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
+****************************************************/
+</script>
+
+<script type="text/javascript">
+window.onload = function() {
+    setupDependencies('EditAccount'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
+  };
+</script>
+
+<body>
+<form method="post" name="EditAccount" action="am.pl">
+
+<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
+<input type="hidden" name="type"               value="account">
+<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
+<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
+<input type="hidden" name="original_accno"    value="[% HTML.escape(accno) %]">
+<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
+<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
+<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
+<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
+<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
+
+<table border="0" width="100%">
+  <tr>
+    <th class="listtop">[% title %]</th>
+  </tr>
+</table>
+
+<fieldset>
+  <legend>
+    [% 'Main Preferences' | $T8 %]
+  </legend>
+  <table>
+    <tr>
+      <td>
+        <label>
+          [% 'Account Number' | $T8 %]
+        </label></td>
+        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
+    </tr>
+    <tr>
+      <td>
+        <label>
+          [% 'Description' | $T8 %]
+        </label>
+      </td>
+      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
+    </tr>
+    <tr>
+      <td>
+        <label>
+          [% 'Chart Type' | $T8 %]
+
+        </label>
+      </td>
+      <td><select name="charttype">[% select_charttype %]</select></td>
+    </tr>
+  </table>
+</fieldset>
+<fieldset class="DEPENDS ON charttype BEING A">
+  <legend>[% 'Account Type' | $T8 %]</legend>
+  <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
+          [% select_category %]</select>
+</fieldset>
+
+[% IF ChartTypeIsAccount %]
+<fieldset class="DEPENDS ON charttype BEING A">
+  <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
+    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
+    &nbsp;[% 'AR' | $T8 %]
+    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
+    &nbsp;[% 'AP' | $T8 %]
+    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
+    &nbsp;[% 'Inventory' | $T8 %]
+</fieldset>
+
+<fieldset class="DEPENDS ON charttype BEING A">
+  <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
+  <p style='font-weight:normal'>[% '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 %]</p>
+  <table width="100%">
+    <tr>
+      <th align="left">[% 'Receivables' | $T8 %]</th>
+      <th align="left">[% 'Payables' | $T8 %]</th>
+      <th align="left">[% 'Parts Inventory' | $T8 %]</th>
+      <th align="left">[% 'Service Items' | $T8 %]</th>
+    </tr>
+    <tr>
+      <td>
+        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
+          [% HTML.escape(AR_amount) %]>&nbsp;
+        [% 'Revenue' | $T8 %] <br>
+        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
+          [% HTML.escape(AR_paid) %]>&nbsp;
+        [% 'Receipt' | $T8 %] <br>
+        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
+          [% HTML.escape(AR_tax) %]>&nbsp;
+        [% 'Tax' | $T8 %]
+      </td>
+      <td>
+        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
+          [% HTML.escape(AP_amount) %]>&nbsp;
+        [% 'Expense/Asset' | $T8 %] <br>
+        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
+          [% HTML.escape(AP_paid) %]>&nbsp;
+        [% 'Payment' | $T8 %] <br>
+        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
+            [% HTML.escape(AP_tax) %]>&nbsp;
+        [% 'Tax' | $T8 %]
+      </td>
+      <td>
+        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
+          [% HTML.escape(IC_sale) %]>&nbsp;
+        [% 'Revenue' | $T8 %] <br>
+        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
+          [% HTML.escape(IC_cogs) %]>&nbsp;
+        [% 'Expense' | $T8 %] <br>
+        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
+          [% HTML.escape(IC_taxpart) %]>&nbsp;
+        [% 'Tax' | $T8 %]
+      </td>
+      <td>
+        <input name=IC_income type=checkbox class=checkbox value="IC_income"
+          [% HTML.escape(IC_income) %]>&nbsp;
+        [% 'Revenue' | $T8 %] <br>
+        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
+          [% HTML.escape(IC_expense) %]>&nbsp;
+        [% 'Expense' | $T8 %] <br>
+        <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
+          [% HTML.escape(IC_taxservice) %]>&nbsp;
+        [% 'Tax' | $T8 %]
+      </td>
+    </tr>
+  </table>
+</fieldset>
+
+<fieldset class="DEPENDS ON charttype BEING A">
+  <legend>
+    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
+  </legend>
+  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]</p>
+
+            <table>
+[% IF account_exists %]
+              <tr>
+                <th align="left">[% 'Taxkey' | $T8 %]</th>
+                <th align="left">[% 'valid from' | $T8 %]</th>
+                <th align="left">[% 'pos_ustva' | $T8 %]</th>
+                <th align="left">[% 'delete' | $T8 %] ? </th>
+              </tr>
+[% FOREACH tk = ACCOUNT_TAXKEYS %]
+              <tr>
+    [% IF tk.id %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
+                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
+                class="checkbox" value="delete"></td>
+    [% ELSE %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
+                <td>&nbsp;</td>
+    [% END %]
+              </tr>
+
+[% END %]
+[% ELSE %]
+<tr>
+  <td align="center" colspan="4"><p>[% 'Save account first to insert taxkeys' | $T8 %]</p>
+  </td>
+</tr>
+[% END %]
+            </table>
+</fieldset>
+
+<fieldset class="DEPENDS ON charttype BEING A">
+  <legend>[% 'Report and misc. Preferences' | $T8 %]</legend>
+  <table>
+        <tr>
+          <th align="left">[% 'EUER' | $T8 %]</th>
+          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
+        </tr>
+        <tr>
+          <th align="left">[% 'BWA' | $T8 %]</th>
+          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
+        </tr>
+        <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
+        <!-- tr>
+          <th align="left">[% 'Bilanz' | $T8 %]</th>
+          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
+        </tr -->
+        <tr>
+          <th align="left">[% 'Datevautomatik' | $T8 %]</th>
+          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
+        </tr>
+        <tr>
+          <th align="left">[% 'Folgekonto' | $T8 %]</th>
+          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
+          <th align="left">[% 'Valid from' | $T8 %]</th>
+          <td><input name="valid_from" value="[% valid_from %]"></td>
+        </tr>
+  </table>
+[% END %]
+</fieldset>
+<hr size="3" noshade>
diff --git a/templates/webpages/am/edit_accounts_de.html b/templates/webpages/am/edit_accounts_de.html
deleted file mode 100644 (file)
index fab2c02..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
-/****************************************************
-* Form Dependency Manager- By Twey- http://www.twey.co.uk
-* Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
-****************************************************/
-</script>
-
-<script type="text/javascript">
-window.onload = function() {
-    setupDependencies('EditAccount'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
-  };
-</script>
-
-<body>
-<form method="post" name="EditAccount" action="am.pl">
-
-<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
-<input type="hidden" name="type"               value="account">
-<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
-<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
-<input type="hidden" name="original_accno"    value="[% HTML.escape(accno) %]">
-<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
-<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
-<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
-<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
-<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
-
-<table border="0" width="100%">
-  <tr>
-    <th class="listtop">[% title %]</th>
-  </tr>
-</table>
-
-<fieldset>
-  <legend>
-    Grundeinstellungen
-  </legend>
-  <table>
-    <tr>
-      <td>
-        <label>
-          Kontonummer
-        </label></td>
-        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          Beschreibung
-        </label>
-      </td>
-      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          Kontentyp
-
-        </label>
-      </td>
-      <td><select name="charttype">[% select_charttype %]</select></td>
-    </tr>
-  </table>
-</fieldset>
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Kontoart</legend>
-  <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          [% select_category %]</select>
-</fieldset>
-
-[% IF ChartTypeIsAccount %]
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Buchungskonto in</legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;Verkauf
-    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;Einkauf
-    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;Inventar
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>In Aufklappmenü aufnehmen</legend>
-  <p style='font-weight:normal'>Dieser Block ist nur dann gültig, wenn das Konto KEIN Buchungskonto ist, und wenn ein gültiger Steuerschlüssel für das Konto existiert. Wird das Konto als Buchungskonto markiert, werden diese Einstellungen entfernt.</p>
-  <table width="100%">
-    <tr>
-      <th align="left">Forderungen</th>
-      <th align="left">Verbindlichkeiten</th>
-      <th align="left">Warenliste</th>
-      <th align="left">Dienstleistungen</th>
-    </tr>
-    <tr>
-      <td>
-        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          [% HTML.escape(AR_amount) %]>&nbsp;
-        Erlöskonto <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
-          [% HTML.escape(AR_paid) %]>&nbsp;
-        Zahlungseingang <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
-          [% HTML.escape(AR_tax) %]>&nbsp;
-        Steuer
-      </td>
-      <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
-          [% HTML.escape(AP_amount) %]>&nbsp;
-        Aufwand/Anlagen <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
-          [% HTML.escape(AP_paid) %]>&nbsp;
-        Zahlungsausgang <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
-            [% HTML.escape(AP_tax) %]>&nbsp;
-        Steuer
-      </td>
-      <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
-          [% HTML.escape(IC_sale) %]>&nbsp;
-        Erlöskonto <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
-          [% HTML.escape(IC_cogs) %]>&nbsp;
-        Aufwandskonto <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
-          [% HTML.escape(IC_taxpart) %]>&nbsp;
-        Steuer
-      </td>
-      <td>
-        <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          [% HTML.escape(IC_income) %]>&nbsp;
-        Erlöskonto <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
-          [% HTML.escape(IC_expense) %]>&nbsp;
-        Aufwandskonto <br>
-        <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          [% HTML.escape(IC_taxservice) %]>&nbsp;
-        Steuer
-      </td>
-    </tr>
-  </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>
-    Steuerautomatik und UStVA
-  </legend>
-  <p style='font-weight:normal'>Achtung: Steuerschlüssel brauchen ein gültiges "Gültig ab"-Datum und werden andernfalls ignoriert.</p>
-
-            <table>
-[% IF account_exists %]
-              <tr>
-                <th align="left">Steuerschlüssel</th>
-                <th align="left">Gültig ab</th>
-                <th align="left">UStVA</th>
-                <th align="left">Löschen ? </th>
-              </tr>
-[% FOREACH tk = ACCOUNT_TAXKEYS %]
-              <tr>
-    [% IF tk.id %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
-                class="checkbox" value="delete"></td>
-    [% ELSE %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td>&nbsp;</td>
-    [% END %]
-              </tr>
-
-[% END %]
-[% ELSE %]
-<tr>
-  <td align="center" colspan="4"><p>Einstellungen sind nach
-  dem Speichern des Kontos verfügbar...</p>
-  </td>
-</tr>
-[% END %]
-            </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Sonstige Einstellungen</legend>
-  <table>
-        <tr>
-          <th align="left">Einnahmen-/Überschussrechnung</th>
-          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
-        </tr>
-        <tr>
-          <th align="left">BWA</th>
-          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
-        </tr>
-        <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
-        <!-- tr>
-          <th align="left">Bilanz</th>
-          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
-        </tr -->
-        <tr>
-          <th align="left">Datevexport</th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
-        </tr>
-        <tr>
-          <th align="left">Folgekonto</th>
-          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left">Gültig ab</th>
-          <td><input name="valid_from" value="[% valid_from %]"></td>
-        </tr>
-  </table>
-[% END %]
-</fieldset>
-<hr size="3" noshade>
diff --git a/templates/webpages/am/edit_accounts_en.html b/templates/webpages/am/edit_accounts_en.html
deleted file mode 100644 (file)
index 26100f9..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
-/****************************************************
-* Form Dependency Manager- By Twey- http://www.twey.co.uk
-* Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
-****************************************************/
-</script>
-
-<script type="text/javascript">
-window.onload = function() {
-    setupDependencies('EditAccount'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
-  };
-</script>
-
-<body>
-<form method="post" name="EditAccount" action="am.pl">
-
-<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
-<input type="hidden" name="type"               value="account">
-<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
-<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
-<input type="hidden" name="original_accno"    value="[% HTML.escape(accno) %]">
-<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
-<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
-<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
-<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
-<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
-
-<table border="0" width="100%">
-  <tr>
-    <th class="listtop">[% title %]</th>
-  </tr>
-</table>
-
-<fieldset>
-  <legend>
-    Main Preferences
-  </legend>
-  <table>
-    <tr>
-      <td>
-        <label>
-          Account Number
-        </label></td>
-        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          Description
-        </label>
-      </td>
-      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          Chart Type
-
-        </label>
-      </td>
-      <td><select name="charttype">[% select_charttype %]</select></td>
-    </tr>
-  </table>
-</fieldset>
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Account Type</legend>
-  <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          [% select_category %]</select>
-</fieldset>
-
-[% IF ChartTypeIsAccount %]
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Is this a summary account to record</legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;Sales
-    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;Purchases
-    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;Inventory
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Include in drop-down menus</legend>
-  <p style='font-weight:normal'>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.</p>
-  <table width="100%">
-    <tr>
-      <th align="left">Receivables</th>
-      <th align="left">Payables</th>
-      <th align="left">Parts Inventory</th>
-      <th align="left">Service Items</th>
-    </tr>
-    <tr>
-      <td>
-        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          [% HTML.escape(AR_amount) %]>&nbsp;
-        Revenue <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
-          [% HTML.escape(AR_paid) %]>&nbsp;
-        Receipt <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
-          [% HTML.escape(AR_tax) %]>&nbsp;
-        Tax
-      </td>
-      <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
-          [% HTML.escape(AP_amount) %]>&nbsp;
-        Expense/Asset <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
-          [% HTML.escape(AP_paid) %]>&nbsp;
-        Payment <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
-            [% HTML.escape(AP_tax) %]>&nbsp;
-        Tax
-      </td>
-      <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
-          [% HTML.escape(IC_sale) %]>&nbsp;
-        Revenue <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
-          [% HTML.escape(IC_cogs) %]>&nbsp;
-        Expense <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
-          [% HTML.escape(IC_taxpart) %]>&nbsp;
-        Tax
-      </td>
-      <td>
-        <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          [% HTML.escape(IC_income) %]>&nbsp;
-        Revenue <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
-          [% HTML.escape(IC_expense) %]>&nbsp;
-        Expense <br>
-        <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          [% HTML.escape(IC_taxservice) %]>&nbsp;
-        Tax
-      </td>
-    </tr>
-  </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>
-    Taxkeys and Taxreport Preferences
-  </legend>
-  <p style='font-weight:normal'>Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.</p>
-
-            <table>
-[% IF account_exists %]
-              <tr>
-                <th align="left">Taxkey</th>
-                <th align="left">valid from</th>
-                <th align="left">pos_ustva</th>
-                <th align="left">delete ? </th>
-              </tr>
-[% FOREACH tk = ACCOUNT_TAXKEYS %]
-              <tr>
-    [% IF tk.id %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
-                class="checkbox" value="delete"></td>
-    [% ELSE %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td>&nbsp;</td>
-    [% END %]
-              </tr>
-
-[% END %]
-[% ELSE %]
-<tr>
-  <td align="center" colspan="4"><p>Save account first to insert taxkeys</p>
-  </td>
-</tr>
-[% END %]
-            </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Report and misc. Preferences</legend>
-  <table>
-        <tr>
-          <th align="left">EUER</th>
-          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
-        </tr>
-        <tr>
-          <th align="left">BWA</th>
-          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
-        </tr>
-        <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
-        <!-- tr>
-          <th align="left">Bilanz</th>
-          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
-        </tr -->
-        <tr>
-          <th align="left">Datevautomatik</th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
-        </tr>
-        <tr>
-          <th align="left">Folgekonto</th>
-          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left">Valid from</th>
-          <td><input name="valid_from" value="[% valid_from %]"></td>
-        </tr>
-  </table>
-[% END %]
-</fieldset>
-<hr size="3" noshade>
diff --git a/templates/webpages/am/edit_accounts_master.html b/templates/webpages/am/edit_accounts_master.html
deleted file mode 100644 (file)
index d6b0dc9..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
-/****************************************************
-* Form Dependency Manager- By Twey- http://www.twey.co.uk
-* Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
-****************************************************/
-</script>
-
-<script type="text/javascript">
-window.onload = function() {
-    setupDependencies('EditAccount'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
-  };
-</script>
-
-<body>
-<form method="post" name="EditAccount" action="am.pl">
-
-<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
-<input type="hidden" name="type"               value="account">
-<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
-<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
-<input type="hidden" name="original_accno"    value="[% HTML.escape(accno) %]">
-<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
-<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
-<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
-<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
-<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
-
-<table border="0" width="100%">
-  <tr>
-    <th class="listtop">[% title %]</th>
-  </tr>
-</table>
-
-<fieldset>
-  <legend>
-    <translate>Main Preferences</translate>
-  </legend>
-  <table>
-    <tr>
-      <td>
-        <label>
-          <translate>Account Number</translate>
-        </label></td>
-        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          <translate>Description</translate>
-        </label>
-      </td>
-      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
-    </tr>
-    <tr>
-      <td>
-        <label>
-          <translate>Chart Type</translate>
-
-        </label>
-      </td>
-      <td><select name="charttype">[% select_charttype %]</select></td>
-    </tr>
-  </table>
-</fieldset>
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Account Type</translate></legend>
-  <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          [% select_category %]</select>
-</fieldset>
-
-[% IF ChartTypeIsAccount %]
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Is this a summary account to record</translate></legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;<translate>AR</translate>
-    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;<translate>AP</translate>
-    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;<translate>Inventory</translate>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Include in drop-down menus</translate></legend>
-  <p style='font-weight:normal'><translate>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.</translate></p>
-  <table width="100%">
-    <tr>
-      <th align="left"><translate>Receivables</translate></th>
-      <th align="left"><translate>Payables</translate></th>
-      <th align="left"><translate>Parts Inventory</translate></th>
-      <th align="left"><translate>Service Items</translate></th>
-    </tr>
-    <tr>
-      <td>
-        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          [% HTML.escape(AR_amount) %]>&nbsp;
-        <translate>Revenue</translate> <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
-          [% HTML.escape(AR_paid) %]>&nbsp;
-        <translate>Receipt</translate> <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
-          [% HTML.escape(AR_tax) %]>&nbsp;
-        <translate>Tax</translate>
-      </td>
-      <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
-          [% HTML.escape(AP_amount) %]>&nbsp;
-        <translate>Expense/Asset</translate> <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
-          [% HTML.escape(AP_paid) %]>&nbsp;
-        <translate>Payment</translate> <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
-            [% HTML.escape(AP_tax) %]>&nbsp;
-        <translate>Tax</translate>
-      </td>
-      <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
-          [% HTML.escape(IC_sale) %]>&nbsp;
-        <translate>Revenue</translate> <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
-          [% HTML.escape(IC_cogs) %]>&nbsp;
-        <translate>Expense</translate> <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
-          [% HTML.escape(IC_taxpart) %]>&nbsp;
-        <translate>Tax</translate>
-      </td>
-      <td>
-        <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          [% HTML.escape(IC_income) %]>&nbsp;
-        <translate>Revenue</translate> <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
-          [% HTML.escape(IC_expense) %]>&nbsp;
-        <translate>Expense</translate> <br>
-        <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          [% HTML.escape(IC_taxservice) %]>&nbsp;
-        <translate>Tax</translate>
-      </td>
-    </tr>
-  </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>
-    <translate>Taxkeys and Taxreport Preferences</translate>
-  </legend>
-  <p style='font-weight:normal'><translate>Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.</translate></p>
-
-            <table>
-[% IF account_exists %]
-              <tr>
-                <th align="left"><translate>Taxkey</translate></th>
-                <th align="left"><translate>valid from</translate></th>
-                <th align="left"><translate>pos_ustva</translate></th>
-                <th align="left"><translate>delete</translate> ? </th>
-              </tr>
-[% FOREACH tk = ACCOUNT_TAXKEYS %]
-              <tr>
-    [% IF tk.id %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
-                class="checkbox" value="delete"></td>
-    [% ELSE %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                <td>&nbsp;</td>
-    [% END %]
-              </tr>
-
-[% END %]
-[% ELSE %]
-<tr>
-  <td align="center" colspan="4"><p><translate>Save account first to insert taxkeys</translate></p>
-  </td>
-</tr>
-[% END %]
-            </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Report and misc. Preferences</translate></legend>
-  <table>
-        <tr>
-          <th align="left"><translate>EUER</translate></th>
-          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
-        </tr>
-        <tr>
-          <th align="left"><translate>BWA</translate></th>
-          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
-        </tr>
-        <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
-        <!-- tr>
-          <th align="left"><translate>Bilanz</translate></th>
-          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
-        </tr -->
-        <tr>
-          <th align="left"><translate>Datevautomatik</translate></th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
-        </tr>
-        <tr>
-          <th align="left"><translate>Folgekonto</translate></th>
-          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left"><translate>Valid from</translate></th>
-          <td><input name="valid_from" value="[% valid_from %]"></td>
-        </tr>
-  </table>
-[% END %]
-</fieldset>
-<hr size="3" noshade>
diff --git a/templates/webpages/am/edit_defaults.html b/templates/webpages/am/edit_defaults.html
new file mode 100644 (file)
index 0000000..ff5cf04
--- /dev/null
@@ -0,0 +1,169 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="am.pl"name="Form">
+
+  <input type="hidden" name="type" value="defaults">
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th colspan="4">[% 'Ranges of numbers' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Invoice Number' | $T8 %]</th>
+     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
+     <th align="right" nowrap>[% 'Last Customer Number' | $T8 %]</th>
+     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Credit Note Number' | $T8 %]</th>
+     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
+     <th align="right" nowrap>[% 'Last Vendor Number' | $T8 %]</th>
+     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Sales Order Number' | $T8 %]</th>
+     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Purchase Order Number' | $T8 %]</th>
+     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
+     <th align="right" nowrap>[% 'Last Article Number' | $T8 %]</th>
+     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Sales Quotation Number' | $T8 %]</th>
+     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
+     <th align="right" nowrap>[% 'Last Service Number' | $T8 %]</th>
+     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last RFQ Number' | $T8 %]</th>
+     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Last Sales Delivery Order Number' | $T8 %]</th>
+     <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
+     <th align="right" nowrap>[% 'Last Purchase Delivery Order Number' | $T8 %]</th>
+     <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4">[% 'Default Accounts' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Inventory Account' | $T8 %]</th>
+     <td colspan="3">
+      <select name="inventory_accno">
+       [%- FOREACH row = ACCNOS_IC %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Revenue Account' | $T8 %]</th>
+     <td colspan="3">
+      <select name="income_accno">
+       [%- FOREACH row = ACCNOS_IC_INCOME %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Expense Account' | $T8 %]</th>
+     <td colspan="3">
+      <select name="expense_accno">
+       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Foreign Exchange Gain' | $T8 %]</th>
+     <td colspan="3">
+      <select name="fxgain_accno">
+       [%- FOREACH row = ACCNOS_FX_GAIN %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Foreign Exchange Loss' | $T8 %]</th>
+     <td colspan="3">
+      <select name="fxloss_accno">
+       [%- FOREACH row = ACCNOS_FX_LOSS %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4">[% 'Miscellaneous' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Business Number' | $T8 %]</th>
+     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Year End' | $T8 %] (mm/dd)</th>
+     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Currencies' | $T8 %] <sup>(1)</sup></th>
+     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Weight unit' | $T8 %]</th>
+ <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
+     <td>
+      [%- INCLUDE 'generic/multibox.html'
+           name          = 'weightunit',
+           default       = defaults_weightunit,
+           style         = 'size:20; maxength:5',
+           DATA          = ALL_UNITS,
+           id_key        = 'name',
+           label_key     = 'name',
+           -%]
+      </td>
+    </tr>
+
+   </table>
+  </p>
+
+  <hr height="3" noshade>
+
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
+
+  <hr height="3" noshade>
+
+  <p>
+   (1) [% 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/edit_defaults_de.html b/templates/webpages/am/edit_defaults_de.html
deleted file mode 100644 (file)
index c4298c7..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl"name="Form">
-
-  <input type="hidden" name="type" value="defaults">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th colspan="4">Nummernkreise</th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Rechnungsnummer</th>
-     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-     <th align="right" nowrap>Letzte Kundennummer</th>
-     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Gutschriftnummer</th>
-     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-     <th align="right" nowrap>Letzte Lieferantennummer</th>
-     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Auftragsnummer</th>
-     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Lieferantenautragsnummer</th>
-     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-     <th align="right" nowrap>Letzte Artikelnummer</th>
-     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Angebotsnummer</th>
-     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-     <th align="right" nowrap>Letzte Dienstleistungsnr.</th>
-     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Anfragenummer</th>
-     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Letzte Lieferscheinnummer (Verkauf)</th>
-     <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
-     <th align="right" nowrap>Letzte Lieferscheinnummer (Einkauf)</th>
-     <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4">Standardkonten</th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Warenbestand</th>
-     <td colspan="3">
-      <select name="inventory_accno">
-       [%- FOREACH row = ACCNOS_IC %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Erlöskonto</th>
-     <td colspan="3">
-      <select name="income_accno">
-       [%- FOREACH row = ACCNOS_IC_INCOME %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Aufwandskonto</th>
-     <td colspan="3">
-      <select name="expense_accno">
-       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Wechselkurserträge</th>
-     <td colspan="3">
-      <select name="fxgain_accno">
-       [%- FOREACH row = ACCNOS_FX_GAIN %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Wechselkursaufwendungen</th>
-     <td colspan="3">
-      <select name="fxloss_accno">
-       [%- FOREACH row = ACCNOS_FX_LOSS %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4">Verschiedenes</th>
-    </tr>
-
-    <tr>
-     <th align="right">Firmennummer</th>
-     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Jahresende (mm/dd)</th>
-     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">W&auml;hrungen <sup>(1)</sup></th>
-     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Gewichtseinheit</th>
- <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
-     <td>
-      [%- INCLUDE 'generic/multibox.html'
-           name          = 'weightunit',
-           default       = defaults_weightunit,
-           style         = 'size:20; maxength:5',
-           DATA          = ALL_UNITS,
-           id_key        = 'name',
-           label_key     = 'name',
-           -%]
-      </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <hr height="3" noshade>
-
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
-
-  <hr height="3" noshade>
-
-  <p>
-   (1) Geben Sie Ihre und weitere Währungen mit bis zu drei Buchstaben pro Währung und Währungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_defaults_en.html b/templates/webpages/am/edit_defaults_en.html
deleted file mode 100644 (file)
index 8b13215..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl"name="Form">
-
-  <input type="hidden" name="type" value="defaults">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th colspan="4">Ranges of numbers</th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Invoice Number</th>
-     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-     <th align="right" nowrap>Last Customer Number</th>
-     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Credit Note Number</th>
-     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-     <th align="right" nowrap>Last Vendor Number</th>
-     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Sales Order Number</th>
-     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Purchase Order Number</th>
-     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-     <th align="right" nowrap>Last Article Number</th>
-     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Sales Quotation Number</th>
-     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-     <th align="right" nowrap>Last Service Number</th>
-     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last RFQ Number</th>
-     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Last Sales Delivery Order Number</th>
-     <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
-     <th align="right" nowrap>Last Purchase Delivery Order Number</th>
-     <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4">Default Accounts</th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Inventory Account</th>
-     <td colspan="3">
-      <select name="inventory_accno">
-       [%- FOREACH row = ACCNOS_IC %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Revenue Account</th>
-     <td colspan="3">
-      <select name="income_accno">
-       [%- FOREACH row = ACCNOS_IC_INCOME %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Expense Account</th>
-     <td colspan="3">
-      <select name="expense_accno">
-       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Foreign Exchange Gain</th>
-     <td colspan="3">
-      <select name="fxgain_accno">
-       [%- FOREACH row = ACCNOS_FX_GAIN %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Foreign Exchange Loss</th>
-     <td colspan="3">
-      <select name="fxloss_accno">
-       [%- FOREACH row = ACCNOS_FX_LOSS %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4">Miscellaneous</th>
-    </tr>
-
-    <tr>
-     <th align="right">Business Number</th>
-     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Year End (mm/dd)</th>
-     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Currencies <sup>(1)</sup></th>
-     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Weight unit</th>
- <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
-     <td>
-      [%- INCLUDE 'generic/multibox.html'
-           name          = 'weightunit',
-           default       = defaults_weightunit,
-           style         = 'size:20; maxength:5',
-           DATA          = ALL_UNITS,
-           id_key        = 'name',
-           label_key     = 'name',
-           -%]
-      </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <hr height="3" noshade>
-
-  <p><input type="submit" class="submit" name="action" value="Save"></p>
-
-  <hr height="3" noshade>
-
-  <p>
-   (1) Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_defaults_master.html b/templates/webpages/am/edit_defaults_master.html
deleted file mode 100644 (file)
index f73ea15..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl"name="Form">
-
-  <input type="hidden" name="type" value="defaults">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th colspan="4"><translate>Ranges of numbers</translate></th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Invoice Number</translate></th>
-     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Customer Number</translate></th>
-     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Credit Note Number</translate></th>
-     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Vendor Number</translate></th>
-     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Sales Order Number</translate></th>
-     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Purchase Order Number</translate></th>
-     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-     <th align="right" nowrap><translate>Last Article Number</translate></th>
-     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Sales Quotation Number</translate></th>
-     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Service Number</translate></th>
-     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last RFQ Number</translate></th>
-     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Last Sales Delivery Order Number</translate></th>
-     <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
-     <th align="right" nowrap><translate>Last Purchase Delivery Order Number</translate></th>
-     <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4"><translate>Default Accounts</translate></th>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Inventory Account</translate></th>
-     <td colspan="3">
-      <select name="inventory_accno">
-       [%- FOREACH row = ACCNOS_IC %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Revenue Account</translate></th>
-     <td colspan="3">
-      <select name="income_accno">
-       [%- FOREACH row = ACCNOS_IC_INCOME %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Expense Account</translate></th>
-     <td colspan="3">
-      <select name="expense_accno">
-       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Foreign Exchange Gain</translate></th>
-     <td colspan="3">
-      <select name="fxgain_accno">
-       [%- FOREACH row = ACCNOS_FX_GAIN %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Foreign Exchange Loss</translate></th>
-     <td colspan="3">
-      <select name="fxloss_accno">
-       [%- FOREACH row = ACCNOS_FX_LOSS %]
-       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="4"><translate>Miscellaneous</translate></th>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Business Number</translate></th>
-     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Year End</translate> (mm/dd)</th>
-     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Currencies</translate> <sup>(1)</sup></th>
-     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Weight unit</translate></th>
- <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
-     <td>
-      [%- INCLUDE 'generic/multibox.html'
-           name          = 'weightunit',
-           default       = defaults_weightunit,
-           style         = 'size:20; maxength:5',
-           DATA          = ALL_UNITS,
-           id_key        = 'name',
-           label_key     = 'name',
-           -%]
-      </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <hr height="3" noshade>
-
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
-
-  <hr height="3" noshade>
-
-  <p>
-   (1) <translate>Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies</translate>
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_price_factor.html b/templates/webpages/am/edit_price_factor.html
new file mode 100644 (file)
index 0000000..105f8b3
--- /dev/null
@@ -0,0 +1,36 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="am.pl">
+
+  <p>
+   <table border="0">
+    <tr>
+     <td align="right">[% 'Description' | $T8 %]</td>
+     <td><input name="description" value="[% HTML.escape(description) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Factor' | $T8 %]</td>
+     <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+   <input type="hidden" name="type" value="price_factor">
+
+   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="[% 'Delete' | $T8 %]">[% END %][% END %]
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/edit_price_factor_de.html b/templates/webpages/am/edit_price_factor_de.html
deleted file mode 100644 (file)
index bf7f3d8..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl">
-
-  <p>
-   <table border="0">
-    <tr>
-     <td align="right">Beschreibung</td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Faktor</td>
-     <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="type" value="price_factor">
-
-   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-   <input type="submit" name="action" value="Speichern">
-   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="Löschen">[% END %][% END %]
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_price_factor_en.html b/templates/webpages/am/edit_price_factor_en.html
deleted file mode 100644 (file)
index 9ee95b2..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl">
-
-  <p>
-   <table border="0">
-    <tr>
-     <td align="right">Description</td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Factor</td>
-     <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="type" value="price_factor">
-
-   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-   <input type="submit" name="action" value="Save">
-   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="Delete">[% END %][% END %]
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_price_factor_master.html b/templates/webpages/am/edit_price_factor_master.html
deleted file mode 100644 (file)
index 8306b78..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl">
-
-  <p>
-   <table border="0">
-    <tr>
-     <td align="right"><translate>Description</translate></td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Factor</translate></td>
-     <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="hidden" name="type" value="price_factor">
-
-   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-   <input type="submit" name="action" value="<translate>Save</translate>">
-   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="<translate>Delete</translate>">[% END %][% END %]
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
new file mode 100644 (file)
index 0000000..c495e69
--- /dev/null
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <form method="post" action="am.pl">
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="type" value="tax">
+
+  <div class="listtop">[% 'Tax-O-Matic' | $T8 %] [% title %]</div>
+
+  <table width="100%">
+   <tr>
+    <td>[% 'tax_taxkey' | $T8 %]</td>
+    <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
+   </tr>
+
+   <tr>
+    <td>[% 'tax_taxdescription' | $T8 %]</td>
+    <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
+   </tr>
+
+   <tr>
+    <td>[% 'tax_percent' | $T8 %]</td>
+    <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
+   </tr>
+
+   <tr>
+    <td>[% 'tax_chartaccno' | $T8 %]</td>
+    <td><select name="chart_id"><option value="0">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
+   </tr>
+
+  </table>
+
+  [% UNLESS orphaned %]
+  <br />
+  [% 'Chartaccounts connected to this Tax:' | $T8 %]
+  [% FOREACH row = TAXINUSE %]
+  <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
+  [% END %]
+  <br />
+  [% END %]
+
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+
+  [% IF orphaned %]
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+  [% END %]
+
+</form>
+</body>
+</html>
+
diff --git a/templates/webpages/am/edit_tax_de.html b/templates/webpages/am/edit_tax_de.html
deleted file mode 100644 (file)
index ee8ba4b..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]<body>
- <form method="post" action="am.pl">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="type" value="tax">
-
-  <div class="listtop">Steuer [% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>Steuerschlüssel</td>
-    <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
-   </tr>
-
-   <tr>
-    <td>Steuername</td>
-    <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
-   </tr>
-
-   <tr>
-    <td>Prozentsatz</td>
-    <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
-   </tr>
-
-   <tr>
-    <td>Automatikkonto</td>
-    <td><select name="chart_id"><option value="0">Kein</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
-   </tr>
-
-  </table>
-
-  [% UNLESS orphaned %]
-  <br />
-  Konten, die mit dieser Steuer verknüpft sind:
-  [% FOREACH row = TAXINUSE %]
-  <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
-  [% END %]
-  <br />
-  [% END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input type="submit" class="submit" name="action" value="Speichern">
-
-  [% IF orphaned %]
-  <input type="submit" class="submit" name="action" value="Löschen">
-  [% END %]
-
-</form>
-</body>
-</html>
-
diff --git a/templates/webpages/am/edit_tax_en.html b/templates/webpages/am/edit_tax_en.html
deleted file mode 100644 (file)
index e08f1b9..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]<body>
- <form method="post" action="am.pl">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="type" value="tax">
-
-  <div class="listtop">Tax-O-Matic [% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>tax_taxkey</td>
-    <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
-   </tr>
-
-   <tr>
-    <td>tax_taxdescription</td>
-    <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
-   </tr>
-
-   <tr>
-    <td>tax_percent</td>
-    <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
-   </tr>
-
-   <tr>
-    <td>tax_chartaccno</td>
-    <td><select name="chart_id"><option value="0">None</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
-   </tr>
-
-  </table>
-
-  [% UNLESS orphaned %]
-  <br />
-  Chartaccounts connected to this Tax:
-  [% FOREACH row = TAXINUSE %]
-  <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
-  [% END %]
-  <br />
-  [% END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input type="submit" class="submit" name="action" value="Save">
-
-  [% IF orphaned %]
-  <input type="submit" class="submit" name="action" value="Delete">
-  [% END %]
-
-</form>
-</body>
-</html>
-
diff --git a/templates/webpages/am/edit_tax_master.html b/templates/webpages/am/edit_tax_master.html
deleted file mode 100644 (file)
index 3d4aed3..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]<body>
- <form method="post" action="am.pl">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="type" value="tax">
-
-  <div class="listtop"><translate>Tax-O-Matic</translate> [% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td><translate>tax_taxkey</translate></td>
-    <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
-   </tr>
-
-   <tr>
-    <td><translate>tax_taxdescription</translate></td>
-    <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
-   </tr>
-
-   <tr>
-    <td><translate>tax_percent</translate></td>
-    <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
-   </tr>
-
-   <tr>
-    <td><translate>tax_chartaccno</translate></td>
-    <td><select name="chart_id"><option value="0"><translate>None</translate></option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
-   </tr>
-
-  </table>
-
-  [% UNLESS orphaned %]
-  <br />
-  <translate>Chartaccounts connected to this Tax:</translate>
-  [% FOREACH row = TAXINUSE %]
-  <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
-  [% END %]
-  <br />
-  [% END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-
-  [% IF orphaned %]
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-  [% END %]
-
-</form>
-</body>
-</html>
-
diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html
new file mode 100644 (file)
index 0000000..70f66fb
--- /dev/null
@@ -0,0 +1,79 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listheading">[% title %]</div>
+
+ <form method="post" name="Form" action="amtemplates.pl">
+
+  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
+
+  [% IF SHOW_EDIT_OPTIONS %]
+   <p>
+    [% 'Template' | $T8 %]
+    <select name="formname">
+     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+    </select>
+
+    [% IF LANGUAGE.size %]
+     [% 'Language' | $T8 %]
+     <select name="language">
+      <option></option>
+      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+     </select>
+    [% END %]
+
+    [% IF PRINTER.size %]
+     [% 'Printer' | $T8 %]
+     <select name="printer">
+      <option></option>
+      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+     </select>
+    [% END %]
+
+    <input type="hidden" name="display_nextsub" value="display_template">
+
+    <input name="action" type="submit" class="submit" value="[% 'Display' | $T8 %]">
+
+   </p>
+
+   <hr>
+  [% END %]
+
+
+
+  [% IF SHOW_CONTENT %]
+   <p>
+    <div class="listtop">
+     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
+    </div>
+   </p>
+
+   [% IF CAN_EDIT %]
+    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
+
+    <p>
+     <input type="hidden" name="save_nextsub" value="save_template">
+     <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+     <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+    </p>
+
+    [% ELSE %]
+
+    <input type="hidden" name="edit_nextsub" value="edit_template">
+
+    <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
+
+    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
+
+    [% IF SHOW_SECOND_EDIT_BUTTON %]
+     <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
+    [% END %]
+
+   [% END %] <!-- CAN_EDIT -->
+
+  [% END %] <!-- SHOW_CONTENT -->
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/edit_templates_de.html b/templates/webpages/am/edit_templates_de.html
deleted file mode 100644 (file)
index 2ffcbe8..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listheading">[% title %]</div>
-
- <form method="post" name="Form" action="amtemplates.pl">
-
-  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
-
-  [% IF SHOW_EDIT_OPTIONS %]
-   <p>
-    Druckvorlage
-    <select name="formname">
-     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-    </select>
-
-    [% IF LANGUAGE.size %]
-     Sprache
-     <select name="language">
-      <option></option>
-      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    [% IF PRINTER.size %]
-     Drucker
-     <select name="printer">
-      <option></option>
-      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    <input type="hidden" name="display_nextsub" value="display_template">
-
-    <input name="action" type="submit" class="submit" value="Anzeigen">
-
-   </p>
-
-   <hr>
-  [% END %]
-
-
-
-  [% IF SHOW_CONTENT %]
-   <p>
-    <div class="listtop">
-     [% IF CAN_EDIT %]Datei bearbeiten[% ELSE %]Datei anzeigen[% END %] [% HTML.escape(display_filename) %]
-    </div>
-   </p>
-
-   [% IF CAN_EDIT %]
-    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
-
-    <p>
-     <input type="hidden" name="save_nextsub" value="save_template">
-     <input type="submit" name="action" value="Speichern">
-     <input type="button" onclick="history.back()" value="Zurück">
-    </p>
-
-    [% ELSE %]
-
-    <input type="hidden" name="edit_nextsub" value="edit_template">
-
-    <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
-
-    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
-
-    [% IF SHOW_SECOND_EDIT_BUTTON %]
-     <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
-    [% END %]
-
-   [% END %] <!-- CAN_EDIT -->
-
-  [% END %] <!-- SHOW_CONTENT -->
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_templates_en.html b/templates/webpages/am/edit_templates_en.html
deleted file mode 100644 (file)
index e80b85e..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listheading">[% title %]</div>
-
- <form method="post" name="Form" action="amtemplates.pl">
-
-  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
-
-  [% IF SHOW_EDIT_OPTIONS %]
-   <p>
-    Template
-    <select name="formname">
-     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-    </select>
-
-    [% IF LANGUAGE.size %]
-     Language
-     <select name="language">
-      <option></option>
-      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    [% IF PRINTER.size %]
-     Printer
-     <select name="printer">
-      <option></option>
-      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    <input type="hidden" name="display_nextsub" value="display_template">
-
-    <input name="action" type="submit" class="submit" value="Display">
-
-   </p>
-
-   <hr>
-  [% END %]
-
-
-
-  [% IF SHOW_CONTENT %]
-   <p>
-    <div class="listtop">
-     [% IF CAN_EDIT %]Edit file[% ELSE %]Display file[% END %] [% HTML.escape(display_filename) %]
-    </div>
-   </p>
-
-   [% IF CAN_EDIT %]
-    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
-
-    <p>
-     <input type="hidden" name="save_nextsub" value="save_template">
-     <input type="submit" name="action" value="Save">
-     <input type="button" onclick="history.back()" value="Back">
-    </p>
-
-    [% ELSE %]
-
-    <input type="hidden" name="edit_nextsub" value="edit_template">
-
-    <p><input name="action" type="submit" class="submit" value="Edit"></p>
-
-    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
-
-    [% IF SHOW_SECOND_EDIT_BUTTON %]
-     <p><input name="action" type="submit" class="submit" value="Edit"></p>
-    [% END %]
-
-   [% END %] <!-- CAN_EDIT -->
-
-  [% END %] <!-- SHOW_CONTENT -->
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_templates_master.html b/templates/webpages/am/edit_templates_master.html
deleted file mode 100644 (file)
index fcf223c..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listheading">[% title %]</div>
-
- <form method="post" name="Form" action="amtemplates.pl">
-
-  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
-
-  [% IF SHOW_EDIT_OPTIONS %]
-   <p>
-    <translate>Template</translate>
-    <select name="formname">
-     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-    </select>
-
-    [% IF LANGUAGE.size %]
-     <translate>Language</translate>
-     <select name="language">
-      <option></option>
-      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    [% IF PRINTER.size %]
-     <translate>Printer</translate>
-     <select name="printer">
-      <option></option>
-      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
-    [% END %]
-
-    <input type="hidden" name="display_nextsub" value="display_template">
-
-    <input name="action" type="submit" class="submit" value="<translate>Display</translate>">
-
-   </p>
-
-   <hr>
-  [% END %]
-
-
-
-  [% IF SHOW_CONTENT %]
-   <p>
-    <div class="listtop">
-     [% IF CAN_EDIT %]<translate>Edit file</translate>[% ELSE %]<translate>Display file</translate>[% END %] [% HTML.escape(display_filename) %]
-    </div>
-   </p>
-
-   [% IF CAN_EDIT %]
-    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
-
-    <p>
-     <input type="hidden" name="save_nextsub" value="save_template">
-     <input type="submit" name="action" value="<translate>Save</translate>">
-     <input type="button" onclick="history.back()" value="<translate>Back</translate>">
-    </p>
-
-    [% ELSE %]
-
-    <input type="hidden" name="edit_nextsub" value="edit_template">
-
-    <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
-
-    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
-
-    [% IF SHOW_SECOND_EDIT_BUTTON %]
-     <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
-    [% END %]
-
-   [% END %] <!-- CAN_EDIT -->
-
-  [% END %] <!-- SHOW_CONTENT -->
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
new file mode 100644 (file)
index 0000000..6494470
--- /dev/null
@@ -0,0 +1,138 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+
+  <hr>
+ [% END %]
+
+ <form method="post" action="[% HTML.escape(script) %]">
+
+ <input type="hidden" name="type" value="unit">
+
+ <table width="100%">
+  <tr>
+   <th class="listtop" colspan="2">[% title %]</th>
+  </tr>
+  <tr height="5"></tr>
+ </table>
+
+ <p>
+  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
+ </p>
+
+ <hr>
+
+ <table width="100%">
+  <tr><th class="listtop">[% 'Add unit' | $T8 %]</th></tr>
+ </table>
+
+ <table>
+  <tr>
+   <th align="right">[% 'Unit' | $T8 %]</th>
+   <td><input name="new_name" size="20" maxlength="20"></td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
+   <td>
+    <select name="new_base_unit">
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
+    </select>
+   </td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Factor' | $T8 %]</th>
+   <td><input name="new_factor"></td>
+  </tr>
+
+  [% FOREACH language = LANGUAGES %]
+   <tr>
+    <th align="right">[% language.description %]</th>
+    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
+    <th align="right">[% 'Plural' | $T8 %]</th>
+    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
+   </tr>
+  [% END %]
+ </table>
+
+ <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
+
+ <hr>
+
+ <table width="100%">
+  <tr><th class="listtop">[% 'Edit units' | $T8 %]</th></tr>
+ </table>
+
+ <p>
+  [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
+ </p>
+
+ <p>
+  [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
+ </p>
+
+ <p>
+  [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
+ </p>
+
+ <table>
+  <tr>
+   <th class="listheading" width="32" align="center" valign="center"><img alt="[% 'up' | $T8 %]" src="image/up.png"><img alt="[% 'down' | $T8 %]" src="image/down.png"></th>
+   <th class="listheading">[% 'Delete' | $T8 %]</th>
+   <th class="listheading">[% 'Unit' | $T8 %]</th>
+   <th class="listheading">[% 'Base unit' | $T8 %]</th>
+   <th class="listheading">[% 'Factor' | $T8 %]</th>
+   [% FOREACH language = LANGUAGES %]
+    <th class="listheading">[% language.description %]</th>
+   [% END %]
+  </tr>
+
+  [% FOREACH row = UNITS %]
+   <tr>
+    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="[% 'up' | $T8 %]" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="[% 'down' | $T8 %]" src="image/down.png" border="0"></a>[% END %]</td>
+    [% IF row.in_use %]
+     <td>
+      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+     </td>
+
+     <td>[% HTML.escape(row.name) %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
+
+     [% ELSE %]
+
+     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
+     <td>
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
+     </td>
+     <td>
+      <select name="base_unit_[% loop.count %]">
+       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
+      </select>
+     </td>
+     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
+    [% END %]
+
+    [% FOREACH language = row.UNITLANGUAGES %]
+     <td>
+      [% 'singular first char' | $T8 %]:
+      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
+      [% 'plural first char' | $T8 %]:
+      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
+     </td>
+    [% END %]
+   </tr>
+
+   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
+ </table>
+
+ <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html
deleted file mode 100644 (file)
index 30d64d7..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
-
-  <hr>
- [% END %]
-
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="type" value="unit">
-
- <table width="100%">
-  <tr>
-   <th class="listtop" colspan="2">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
- </table>
-
- <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der
-  sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen,
-  dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen
-  Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So
-  ist die Definition von &quot;kg&quot; mit der Basiseinheit
-  &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von
-  &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor
-  &quot;0,001&quot; hingegen nicht.
- </p>
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop">Einheit hinzuf&uuml;gen</th></tr>
- </table>
-
- <table>
-  <tr>
-   <th align="right">Einheit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Basiseinheit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Faktor</th>
-   <td><input name="new_factor"></td>
-  </tr>
-
-  [% FOREACH language = LANGUAGES %]
-   <tr>
-    <th align="right">[% language.description %]</th>
-    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right">Plural</th>
-    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
-   </tr>
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="Erfassen">
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop">Einheiten bearbeiten</th></tr>
- </table>
-
- <p>
-  Einheiten, die bereits in Benutzung sind (z.B. bei einer Warendefinition, einer Rechnung oder bei einer Lagerbuchung) k&ouml;nnen nachtr&auml;glich nicht mehr ver&auml;ndert werden.
- </p>
-
- <p>
-  Einheiten, die zum L&ouml;schen markiert sind, werden beim Speichern gel&ouml;scht.
- </p>
-
- <p>
-  Bei den &Uuml;bersetzungen k&ouml;nnen Sie unterschiedliche Varianten f&uuml;r singular und plural angeben (z.B. &quot;day&quot; und &quot;days&quot;).
- </p>
-
- <table>
-  <tr>
-   <th class="listheading" width="32" align="center" valign="center"><img alt="hoch" src="image/up.png"><img alt="runter" src="image/down.png"></th>
-   <th class="listheading">Löschen</th>
-   <th class="listheading">Einheit</th>
-   <th class="listheading">Basiseinheit</th>
-   <th class="listheading">Faktor</th>
-   [% FOREACH language = LANGUAGES %]
-    <th class="listheading">[% language.description %]</th>
-   [% END %]
-  </tr>
-
-  [% FOREACH row = UNITS %]
-   <tr>
-    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="hoch" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="runter" src="image/down.png" border="0"></a>[% END %]</td>
-    [% IF row.in_use %]
-     <td>
-      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-     </td>
-
-     <td>[% HTML.escape(row.name) %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
-
-     [% ELSE %]
-
-     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
-     <td>
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
-     </td>
-     <td>
-      <select name="base_unit_[% loop.count %]">
-       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
-      </select>
-     </td>
-     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
-    [% END %]
-
-    [% FOREACH language = row.UNITLANGUAGES %]
-     <td>
-      S:
-      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      P:
-      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
-     </td>
-    [% END %]
-   </tr>
-
-   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="Speichern">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_units_en.html b/templates/webpages/am/edit_units_en.html
deleted file mode 100644 (file)
index 21a18be..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
-
-  <hr>
- [% END %]
-
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="type" value="unit">
-
- <table width="100%">
-  <tr>
-   <th class="listtop" colspan="2">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
- </table>
-
- <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der
-  sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen,
-  dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen
-  Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So
-  ist die Definition von &quot;kg&quot; mit der Basiseinheit
-  &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von
-  &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor
-  &quot;0,001&quot; hingegen nicht.
- </p>
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop">Add unit</th></tr>
- </table>
-
- <table>
-  <tr>
-   <th align="right">Unit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Base unit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Factor</th>
-   <td><input name="new_factor"></td>
-  </tr>
-
-  [% FOREACH language = LANGUAGES %]
-   <tr>
-    <th align="right">[% language.description %]</th>
-    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right">Plural</th>
-    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
-   </tr>
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="Add">
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop">Edit units</th></tr>
- </table>
-
- <p>
-  Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.
- </p>
-
- <p>
-  Units marked for deletion will be deleted upon saving.
- </p>
-
- <p>
-  You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).
- </p>
-
- <table>
-  <tr>
-   <th class="listheading" width="32" align="center" valign="center"><img alt="up" src="image/up.png"><img alt="down" src="image/down.png"></th>
-   <th class="listheading">Delete</th>
-   <th class="listheading">Unit</th>
-   <th class="listheading">Base unit</th>
-   <th class="listheading">Factor</th>
-   [% FOREACH language = LANGUAGES %]
-    <th class="listheading">[% language.description %]</th>
-   [% END %]
-  </tr>
-
-  [% FOREACH row = UNITS %]
-   <tr>
-    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="up" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="down" src="image/down.png" border="0"></a>[% END %]</td>
-    [% IF row.in_use %]
-     <td>
-      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-     </td>
-
-     <td>[% HTML.escape(row.name) %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
-
-     [% ELSE %]
-
-     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
-     <td>
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
-     </td>
-     <td>
-      <select name="base_unit_[% loop.count %]">
-       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
-      </select>
-     </td>
-     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
-    [% END %]
-
-    [% FOREACH language = row.UNITLANGUAGES %]
-     <td>
-      singular first char:
-      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      plural first char:
-      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
-     </td>
-    [% END %]
-   </tr>
-
-   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="Save">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html
deleted file mode 100644 (file)
index 1960e46..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
-
-  <hr>
- [% END %]
-
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="type" value="unit">
-
- <table width="100%">
-  <tr>
-   <th class="listtop" colspan="2">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
- </table>
-
- <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der
-  sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen,
-  dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen
-  Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So
-  ist die Definition von &quot;kg&quot; mit der Basiseinheit
-  &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von
-  &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor
-  &quot;0,001&quot; hingegen nicht.
- </p>
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop"><translate>Add unit</translate></th></tr>
- </table>
-
- <table>
-  <tr>
-   <th align="right"><translate>Unit</translate></th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Base unit</translate></th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Factor</translate></th>
-   <td><input name="new_factor"></td>
-  </tr>
-
-  [% FOREACH language = LANGUAGES %]
-   <tr>
-    <th align="right">[% language.description %]</th>
-    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right"><translate>Plural</translate></th>
-    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
-   </tr>
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
-
- <hr>
-
- <table width="100%">
-  <tr><th class="listtop"><translate>Edit units</translate></th></tr>
- </table>
-
- <p>
-  <translate>Units that have already been used (e.g. for parts and
-   services or in invoices or warehouse transactions) cannot be
-   changed.</translate>
- </p>
-
- <p>
-  <translate>Units marked for deletion will be deleted upon
-   saving.</translate>
- </p>
-
- <p>
-  <translate>You can declare different translations for singular and
-   plural for each unit (e.g. &quot;day&quot; and
-   &quot;days).</translate>
- </p>
-
- <table>
-  <tr>
-   <th class="listheading" width="32" align="center" valign="center"><img alt="<translate>up</translate>" src="image/up.png"><img alt="<translate>down</translate>" src="image/down.png"></th>
-   <th class="listheading"><translate>Delete</translate></th>
-   <th class="listheading"><translate>Unit</translate></th>
-   <th class="listheading"><translate>Base unit</translate></th>
-   <th class="listheading"><translate>Factor</translate></th>
-   [% FOREACH language = LANGUAGES %]
-    <th class="listheading">[% language.description %]</th>
-   [% END %]
-  </tr>
-
-  [% FOREACH row = UNITS %]
-   <tr>
-    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="<translate>up</translate>" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="<translate>down</translate>" src="image/down.png" border="0"></a>[% END %]</td>
-    [% IF row.in_use %]
-     <td>
-      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-     </td>
-
-     <td>[% HTML.escape(row.name) %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
-
-     [% ELSE %]
-
-     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
-     <td>
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
-     </td>
-     <td>
-      <select name="base_unit_[% loop.count %]">
-       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
-      </select>
-     </td>
-     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
-    [% END %]
-
-    [% FOREACH language = row.UNITLANGUAGES %]
-     <td>
-      <translate>singular first char</translate>:
-      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      <translate>plural first char</translate>:
-      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
-     </td>
-    [% END %]
-   </tr>
-
-   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_warehouse.html b/templates/webpages/am/edit_warehouse.html
new file mode 100644 (file)
index 0000000..c7ca819
--- /dev/null
@@ -0,0 +1,112 @@
+[%- USE T8 %]
+[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <form method="post" action="am.pl">
+
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+
+  <input type="hidden" name="type" value="warehouse">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <div class="listtop">[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</div>
+
+  <table border="0">
+   <tr>
+    <td align="right">[% 'Description' | $T8 %]</td>
+    <td>
+     <input name="description" size="60" value="[% HTML.escape(description) %]">
+     <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Invalid' | $T8 %]</td>
+    <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Number of new bins' | $T8 %]</td>
+    <td><input name="number_of_new_bins"></td>
+   </tr>
+
+   <tr>
+    <td align="right">[%- 'Prefix for the new bins\' names' | $T8 %]</td>
+    <td><input name="prefix" value="[% 'Bin' | $T8 %]"></td>
+   </tr>
+  </table>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+   [%- IF id %][%- UNLESS in_use %]
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+   [%- END %][%- END %]
+  </p>
+
+ </form>
+
+ [% IF id %]
+
+ <hr height="3">
+
+ <div class="listtop">[% 'Edit Bins' | $T8 %]</div>
+
+ [% UNLESS BINS.size %]
+ <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
+
+ [% ELSE %]
+
+ <p>
+  [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the &quot;Delete&quot; column.' | $T8 %]
+ </p>
+
+ <form method="post" action="am.pl">
+
+  <input type="hidden" name="warehouse_id" value="[% HTML.escape(id) %]">
+
+  <input type="hidden" name="type" value="bin">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <table border="0">
+   <tr>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
+   </tr>
+   [%- SET row_odd = '1' %]
+   [%- USE bin_it = Iterator(BINS) %]
+   [%- FOREACH bin = bin_it %]
+   [%- IF row_odd %]
+   <tr>
+    [%- END %]
+
+    <td>[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
+    <td>
+     <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
+     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]">
+    </td>
+
+    [%- SET end_tr = '0' %]
+    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
+    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
+    [%- IF end_tr %]
+   </tr>
+   [%- END %]
+
+   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
+   [%- END %]
+  </table>
+
+  <input type="hidden" name="rowcount" value="[% BINS.size %]">
+
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
+ </form>
+
+ [% END %]
+
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/am/edit_warehouse_de.html b/templates/webpages/am/edit_warehouse_de.html
deleted file mode 100644 (file)
index 81bf9a4..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <div class="listtop">[% IF id %]Lager bearbeiten[% ELSE %]Lager erfassen[% END %]</div>
-
-  <table border="0">
-   <tr>
-    <td align="right">Beschreibung</td>
-    <td>
-     <input name="description" size="60" value="[% HTML.escape(description) %]">
-     <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Ung&uuml;ltig</td>
-    <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
-   </tr>
-
-   <tr>
-    <td align="right">Anzahl neuer Lagerpl&auml;tze</td>
-    <td><input name="number_of_new_bins"></td>
-   </tr>
-
-   <tr>
-    <td align="right">Namenspr&auml;fix f&uuml;r die neuen Lagerpl&auml;tze</td>
-    <td><input name="prefix" value="Lagerplatz"></td>
-   </tr>
-  </table>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
-   [%- IF id %][%- UNLESS in_use %]
-   <input type="submit" class="submit" name="action" value="Löschen">
-   [%- END %][%- END %]
-  </p>
-
- </form>
-
- [% IF id %]
-
- <hr height="3">
-
- <div class="listtop">Lagerpl&auml;tze bearbeiten</div>
-
- [% UNLESS BINS.size %]
- <p>Es wurden zu diesem Lager noch keine Lagerpl&auml;tze angelegt.</p>
-
- [% ELSE %]
-
- <p>
-  Lagerpl&auml;tze, die bereits benutzt wurden, k&ouml;nnen nicht mehr gel&ouml;scht werden. Deswegen fehlt bei ihnen die Checkbox in der Spalte &quot;L&ouml;schen&quot;.
- </p>
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="bin">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <table border="0">
-   <tr>
-    <th class="listheading">Löschen</th><th class="listheading">Beschreibung</th>
-    <th class="listheading">Löschen</th><th class="listheading">Beschreibung</th>
-   </tr>
-   [%- SET row_odd = '1' %]
-   [%- USE bin_it = Iterator(BINS) %]
-   [%- FOREACH bin = bin_it %]
-   [%- IF row_odd %]
-   <tr>
-    [%- END %]
-
-    <td>[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
-    <td>
-     <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
-     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]">
-    </td>
-
-    [%- SET end_tr = '0' %]
-    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
-    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
-    [%- IF end_tr %]
-   </tr>
-   [%- END %]
-
-   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
-   [%- END %]
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% BINS.size %]">
-
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
- </form>
-
- [% END %]
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_warehouse_en.html b/templates/webpages/am/edit_warehouse_en.html
deleted file mode 100644 (file)
index 753f131..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <div class="listtop">[% IF id %]Edit Warehouse[% ELSE %]Add Warehouse[% END %]</div>
-
-  <table border="0">
-   <tr>
-    <td align="right">Description</td>
-    <td>
-     <input name="description" size="60" value="[% HTML.escape(description) %]">
-     <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Invalid</td>
-    <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
-   </tr>
-
-   <tr>
-    <td align="right">Number of new bins</td>
-    <td><input name="number_of_new_bins"></td>
-   </tr>
-
-   <tr>
-    <td align="right">Prefix for the new bins' names</td>
-    <td><input name="prefix" value="Bin"></td>
-   </tr>
-  </table>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Save">
-   [%- IF id %][%- UNLESS in_use %]
-   <input type="submit" class="submit" name="action" value="Delete">
-   [%- END %][%- END %]
-  </p>
-
- </form>
-
- [% IF id %]
-
- <hr height="3">
-
- <div class="listtop">Edit Bins</div>
-
- [% UNLESS BINS.size %]
- <p>No bins have been added to this warehouse yet.</p>
-
- [% ELSE %]
-
- <p>
-  Bins that have been used in the past cannot be deleted anymore. For these bins there's no checkbox in the &quot;Delete&quot; column.
- </p>
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="bin">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <table border="0">
-   <tr>
-    <th class="listheading">Delete</th><th class="listheading">Description</th>
-    <th class="listheading">Delete</th><th class="listheading">Description</th>
-   </tr>
-   [%- SET row_odd = '1' %]
-   [%- USE bin_it = Iterator(BINS) %]
-   [%- FOREACH bin = bin_it %]
-   [%- IF row_odd %]
-   <tr>
-    [%- END %]
-
-    <td>[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
-    <td>
-     <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
-     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]">
-    </td>
-
-    [%- SET end_tr = '0' %]
-    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
-    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
-    [%- IF end_tr %]
-   </tr>
-   [%- END %]
-
-   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
-   [%- END %]
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% BINS.size %]">
-
-  <p><input type="submit" class="submit" name="action" value="Save"></p>
- </form>
-
- [% END %]
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/am/edit_warehouse_master.html b/templates/webpages/am/edit_warehouse_master.html
deleted file mode 100644 (file)
index d6f21ce..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="warehouse">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <div class="listtop">[% IF id %]<translate>Edit Warehouse</translate>[% ELSE %]<translate>Add Warehouse</translate>[% END %]</div>
-
-  <table border="0">
-   <tr>
-    <td align="right"><translate>Description</translate></td>
-    <td>
-     <input name="description" size="60" value="[% HTML.escape(description) %]">
-     <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Invalid</translate></td>
-    <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Number of new bins</translate></td>
-    <td><input name="number_of_new_bins"></td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Prefix for the new bins' names</translate></td>
-    <td><input name="prefix" value="<translate>Bin</translate>"></td>
-   </tr>
-  </table>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-   [%- IF id %][%- UNLESS in_use %]
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-   [%- END %][%- END %]
-  </p>
-
- </form>
-
- [% IF id %]
-
- <hr height="3">
-
- <div class="listtop"><translate>Edit Bins</translate></div>
-
- [% UNLESS BINS.size %]
- <p><translate>No bins have been added to this warehouse yet.</translate></p>
-
- [% ELSE %]
-
- <p>
-  <translate>Bins that have been used in the past cannot be deleted
-   anymore. For these bins there's no checkbox in the
-   &quot;Delete&quot; column.</translate>
- </p>
-
- <form method="post" action="am.pl">
-
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(id) %]">
-
-  <input type="hidden" name="type" value="bin">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <table border="0">
-   <tr>
-    <th class="listheading"><translate>Delete</translate></th><th class="listheading"><translate>Description</translate></th>
-    <th class="listheading"><translate>Delete</translate></th><th class="listheading"><translate>Description</translate></th>
-   </tr>
-   [%- SET row_odd = '1' %]
-   [%- USE bin_it = Iterator(BINS) %]
-   [%- FOREACH bin = bin_it %]
-   [%- IF row_odd %]
-   <tr>
-    [%- END %]
-
-    <td>[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
-    <td>
-     <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
-     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]">
-    </td>
-
-    [%- SET end_tr = '0' %]
-    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
-    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
-    [%- IF end_tr %]
-   </tr>
-   [%- END %]
-
-   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
-   [%- END %]
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% BINS.size %]">
-
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
- </form>
-
- [% END %]
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_account_details.html b/templates/webpages/am/list_account_details.html
new file mode 100644 (file)
index 0000000..884dc7d
--- /dev/null
@@ -0,0 +1,64 @@
+[%- USE T8 %]
+[% USE HTML %] [% FOREACH row = CA %]
+<table width="100%">
+
+ <colgroup>
+  <col width="10%">
+  <col width="10%">
+  <col width="10%">
+  <col width="50%">
+  <col width="10%">
+  <col width="10%">
+ </colgroup>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
+  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_detail_emph">
+   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
+  </td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header">[% 'Taxlink_coa' | $T8 %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2">[% 'Taxkey_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxaccount_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxdescription_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Posustva_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Startdate_coa' | $T8 %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header">[% 'Report Positions' | $T8 %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2">[% 'pos_bwa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_bilanz' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_eur' | $T8 %]</td>
+  <td colspan="2" class="coa_details_header2">[% 'Datevautomatik' | $T8 %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
+  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]</td>
+ </tr>
+</table>
+
+[% END %]
diff --git a/templates/webpages/am/list_account_details_de.html b/templates/webpages/am/list_account_details_de.html
deleted file mode 100644 (file)
index 9caeece..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %] [% FOREACH row = CA %]
-<table width="100%">
-
- <colgroup>
-  <col width="10%">
-  <col width="10%">
-  <col width="10%">
-  <col width="50%">
-  <col width="10%">
-  <col width="10%">
- </colgroup>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
-  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_detail_emph">
-   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
-  </td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Steuerautomatik</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">Steuerschlüssel</td>
-  <td class="coa_details_header2">Automatikkonto</td>
-  <td class="coa_details_header2">Steuer</td>
-  <td class="coa_details_header2">USTVA Kennz.</td>
-  <td class="coa_details_header2">Gültig ab</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Berichte</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">BWA</td>
-  <td class="coa_details_header2">Bilanz</td>
-  <td class="coa_details_header2">E/ÜR</td>
-  <td colspan="2" class="coa_details_header2">Datevexport</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]An[% ELSE %]Aus[% END %]</td>
- </tr>
-</table>
-
-[% END %]
diff --git a/templates/webpages/am/list_account_details_en.html b/templates/webpages/am/list_account_details_en.html
deleted file mode 100644 (file)
index 8bf1c3f..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %] [% FOREACH row = CA %]
-<table width="100%">
-
- <colgroup>
-  <col width="10%">
-  <col width="10%">
-  <col width="10%">
-  <col width="50%">
-  <col width="10%">
-  <col width="10%">
- </colgroup>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
-  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_detail_emph">
-   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
-  </td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Taxlink_coa</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">Taxkey_coa</td>
-  <td class="coa_details_header2">Taxaccount_coa</td>
-  <td class="coa_details_header2">Taxdescription_coa</td>
-  <td class="coa_details_header2">Posustva_coa</td>
-  <td class="coa_details_header2">Startdate_coa</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Report Positions</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">pos_bwa</td>
-  <td class="coa_details_header2">pos_bilanz</td>
-  <td class="coa_details_header2">pos_eur</td>
-  <td colspan="2" class="coa_details_header2">Datevautomatik</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]On[% ELSE %]Off[% END %]</td>
- </tr>
-</table>
-
-[% 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 (file)
index a83a82e..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %] [% FOREACH row = CA %]
-<table width="100%">
-
- <colgroup>
-  <col width="10%">
-  <col width="10%">
-  <col width="10%">
-  <col width="50%">
-  <col width="10%">
-  <col width="10%">
- </colgroup>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
-  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_detail_emph">
-   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
-  </td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header"><translate>Taxlink_coa</translate></td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2"><translate>Taxkey_coa</translate></td>
-  <td class="coa_details_header2"><translate>Taxaccount_coa</translate></td>
-  <td class="coa_details_header2"><translate>Taxdescription_coa</translate></td>
-  <td class="coa_details_header2"><translate>Posustva_coa</translate></td>
-  <td class="coa_details_header2"><translate>Startdate_coa</translate></td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header"><translate>Report Positions</translate></td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2"><translate>pos_bwa</translate></td>
-  <td class="coa_details_header2"><translate>pos_bilanz</translate></td>
-  <td class="coa_details_header2"><translate>pos_eur</translate></td>
-  <td colspan="2" class="coa_details_header2"><translate>Datevautomatik</translate></td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]<translate>On</translate>[% ELSE %]<translate>Off</translate>[% END %]</td>
- </tr>
-</table>
-
-[% END %]
diff --git a/templates/webpages/am/list_accounts.html b/templates/webpages/am/list_accounts.html
new file mode 100644 (file)
index 0000000..8392bf5
--- /dev/null
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <br/><div id='pjxdebugrequest'></div><br/>
+
+ <div class="coa_listtop">[% title %]</div>
+
+ <br />
+
+ <table width="100%">
+
+  <colgroup>
+   <col width="10%">
+   <col width="10%">
+   <col width="10%">
+   <col width="50%">
+   <col width="10%">
+   <col width="10%">
+  </colgroup>
+
+  <tr class="coa_listheading">
+   <td class="coa_listheading_element">[% 'Account' | $T8 %]</td>
+   <td colspan="3" class="coa_listheading_element">[% 'Description (Click on Description for details)' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Debit' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Credit' | $T8 %]</td>
+  </tr>
+
+  [% SET row_odd = '1' %][% FOREACH row = CA %]
+
+  [% IF row.heading %]
+  <tr>
+   <td class="accountlistheading"><a href="[% row.link_edit_account %]">[% HTML.escape(row.accno) %]</a></td>
+   <td colspan="5" class="accountlistheading">[% HTML.escape(row.description) %]</td>
+  </tr>
+
+  [% ELSE %]
+
+  <tr class="coa_listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+
+   <td class="coa_account_header">
+    <b><a href="[% row.link_edit_account %]" >[% HTML.escape(row.accno) %]</a></b>
+   </td>
+
+   <input type="hidden" name="chart_id" value="[% HTML.escape(row.id) %]" id="chart_id_[% HTML.escape(row.id) %]" >
+   <td colspan="3" id="accountcontent[% HTML.escape(row.id) %]-title" class="coa_account_header_sc"
+       onclick="list_account_details( ['chart_id_[% HTML.escape(row.id) %]'], ['ajaxcontent[% HTML.escape(row.id) %]'] )">
+    [% HTML.escape(row.description) %]
+   </td>
+
+    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.debit) %]</div></td>
+    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.credit) %]</div>
+    </td>
+  </tr>
+
+  <tr class="coa_detail">
+   <td colspan="6" width="100%"><div id="ajaxcontent[% HTML.escape(row.id) %]"></div></td>
+  </tr>
+
+  [% END %]
+
+  [% END %]
+
+ </table>
+
+</body>
+</html>
diff --git a/templates/webpages/am/list_accounts_de.html b/templates/webpages/am/list_accounts_de.html
deleted file mode 100644 (file)
index 2f0543a..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[% USE HTML %]<body>
-
- <br/><div id='pjxdebugrequest'></div><br/>
-
- <div class="coa_listtop">[% title %]</div>
-
- <br />
-
- <table width="100%">
-
-  <colgroup>
-   <col width="10%">
-   <col width="10%">
-   <col width="10%">
-   <col width="50%">
-   <col width="10%">
-   <col width="10%">
-  </colgroup>
-
-  <tr class="coa_listheading">
-   <td class="coa_listheading_element">Konto</td>
-   <td colspan="3" class="coa_listheading_element">Beschreibung (Klick
-  öffnet einzelne Kontendetails)</td>
-   <td class="coa_listheading_element">Soll</td>
-   <td class="coa_listheading_element">Haben</td>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = CA %]
-
-  [% IF row.heading %]
-  <tr>
-   <td class="accountlistheading"><a href="[% row.link_edit_account %]">[% HTML.escape(row.accno) %]</a></td>
-   <td colspan="5" class="accountlistheading">[% HTML.escape(row.description) %]</td>
-  </tr>
-
-  [% ELSE %]
-
-  <tr class="coa_listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-
-   <td class="coa_account_header">
-    <b><a href="[% row.link_edit_account %]" >[% HTML.escape(row.accno) %]</a></b>
-   </td>
-
-   <input type="hidden" name="chart_id" value="[% HTML.escape(row.id) %]" id="chart_id_[% HTML.escape(row.id) %]" >
-   <td colspan="3" id="accountcontent[% HTML.escape(row.id) %]-title" class="coa_account_header_sc"
-       onclick="list_account_details( ['chart_id_[% HTML.escape(row.id) %]'], ['ajaxcontent[% HTML.escape(row.id) %]'] )">
-    [% HTML.escape(row.description) %]
-   </td>
-
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.debit) %]</div></td>
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.credit) %]</div>
-    </td>
-  </tr>
-
-  <tr class="coa_detail">
-   <td colspan="6" width="100%"><div id="ajaxcontent[% HTML.escape(row.id) %]"></div></td>
-  </tr>
-
-  [% END %]
-
-  [% END %]
-
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_accounts_en.html b/templates/webpages/am/list_accounts_en.html
deleted file mode 100644 (file)
index 0b339c3..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body>
-
- <br/><div id='pjxdebugrequest'></div><br/>
-
- <div class="coa_listtop">[% title %]</div>
-
- <br />
-
- <table width="100%">
-
-  <colgroup>
-   <col width="10%">
-   <col width="10%">
-   <col width="10%">
-   <col width="50%">
-   <col width="10%">
-   <col width="10%">
-  </colgroup>
-
-  <tr class="coa_listheading">
-   <td class="coa_listheading_element">Account</td>
-   <td colspan="3" class="coa_listheading_element">Description (Click on Description for details)</td>
-   <td class="coa_listheading_element">Debit</td>
-   <td class="coa_listheading_element">Credit</td>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = CA %]
-
-  [% IF row.heading %]
-  <tr>
-   <td class="accountlistheading"><a href="[% row.link_edit_account %]">[% HTML.escape(row.accno) %]</a></td>
-   <td colspan="5" class="accountlistheading">[% HTML.escape(row.description) %]</td>
-  </tr>
-
-  [% ELSE %]
-
-  <tr class="coa_listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-
-   <td class="coa_account_header">
-    <b><a href="[% row.link_edit_account %]" >[% HTML.escape(row.accno) %]</a></b>
-   </td>
-
-   <input type="hidden" name="chart_id" value="[% HTML.escape(row.id) %]" id="chart_id_[% HTML.escape(row.id) %]" >
-   <td colspan="3" id="accountcontent[% HTML.escape(row.id) %]-title" class="coa_account_header_sc"
-       onclick="list_account_details( ['chart_id_[% HTML.escape(row.id) %]'], ['ajaxcontent[% HTML.escape(row.id) %]'] )">
-    [% HTML.escape(row.description) %]
-   </td>
-
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.debit) %]</div></td>
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.credit) %]</div>
-    </td>
-  </tr>
-
-  <tr class="coa_detail">
-   <td colspan="6" width="100%"><div id="ajaxcontent[% HTML.escape(row.id) %]"></div></td>
-  </tr>
-
-  [% END %]
-
-  [% END %]
-
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_accounts_master.html b/templates/webpages/am/list_accounts_master.html
deleted file mode 100644 (file)
index da998e2..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body>
-
- <br/><div id='pjxdebugrequest'></div><br/>
-
- <div class="coa_listtop">[% title %]</div>
-
- <br />
-
- <table width="100%">
-
-  <colgroup>
-   <col width="10%">
-   <col width="10%">
-   <col width="10%">
-   <col width="50%">
-   <col width="10%">
-   <col width="10%">
-  </colgroup>
-
-  <tr class="coa_listheading">
-   <td class="coa_listheading_element"><translate>Account</translate></td>
-   <td colspan="3" class="coa_listheading_element"><translate>Description (Click on Description for details)</translate></td>
-   <td class="coa_listheading_element"><translate>Debit</translate></td>
-   <td class="coa_listheading_element"><translate>Credit</translate></td>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = CA %]
-
-  [% IF row.heading %]
-  <tr>
-   <td class="accountlistheading"><a href="[% row.link_edit_account %]">[% HTML.escape(row.accno) %]</a></td>
-   <td colspan="5" class="accountlistheading">[% HTML.escape(row.description) %]</td>
-  </tr>
-
-  [% ELSE %]
-
-  <tr class="coa_listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-
-   <td class="coa_account_header">
-    <b><a href="[% row.link_edit_account %]" >[% HTML.escape(row.accno) %]</a></b>
-   </td>
-
-   <input type="hidden" name="chart_id" value="[% HTML.escape(row.id) %]" id="chart_id_[% HTML.escape(row.id) %]" >
-   <td colspan="3" id="accountcontent[% HTML.escape(row.id) %]-title" class="coa_account_header_sc"
-       onclick="list_account_details( ['chart_id_[% HTML.escape(row.id) %]'], ['ajaxcontent[% HTML.escape(row.id) %]'] )">
-    [% HTML.escape(row.description) %]
-   </td>
-
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.debit) %]</div></td>
-    <td class="coa_account_header"><div class="coa_amount">[% HTML.escape(row.credit) %]</div>
-    </td>
-  </tr>
-
-  <tr class="coa_detail">
-   <td colspan="6" width="100%"><div id="ajaxcontent[% HTML.escape(row.id) %]"></div></td>
-  </tr>
-
-  [% END %]
-
-  [% END %]
-
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_price_factors.html b/templates/webpages/am/list_price_factors.html
new file mode 100644 (file)
index 0000000..73c9f31
--- /dev/null
@@ -0,0 +1,40 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
+
+ <div class="listtop">[% title %]</div>
+
+ <p>
+  <table width="100%">
+   <tr>
+    <td class="listheading" width="0%"></td>
+    <td class="listheading" width="0%"></td>
+    <td class="listheading" width="80%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Factor' | $T8 %]</td>
+   </tr>
+
+   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
+   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+    <td>[% IF factor.previous_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.previous_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
+    <td>[% IF factor.next_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.next_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
+    <td><a href="[% url_base %]&action=edit_price_factor&id=[% HTML.url(factor.id) %]">[% HTML.escape(factor.description) %]</a></td>
+    <td>[% HTML.escape(factor.factor) %]</td>
+   </tr>
+   [% END %]
+  </table>
+ </p>
+
+ <hr height="3">
+
+ <p>
+  <form method="post" action="am.pl">
+   <input type="hidden" name="type" value="price_factor">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/am/list_price_factors_de.html b/templates/webpages/am/list_price_factors_de.html
deleted file mode 100644 (file)
index f6708e1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="80%">Beschreibung</td>
-    <td class="listheading" width="20%">Faktor</td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF factor.previous_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.previous_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF factor.next_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.next_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_price_factor&id=[% HTML.url(factor.id) %]">[% HTML.escape(factor.description) %]</a></td>
-    <td>[% HTML.escape(factor.factor) %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="price_factor">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="submit" class="submit" name="action" value="Erfassen">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_price_factors_en.html b/templates/webpages/am/list_price_factors_en.html
deleted file mode 100644 (file)
index 9001c9c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="80%">Description</td>
-    <td class="listheading" width="20%">Factor</td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF factor.previous_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.previous_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF factor.next_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.next_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_price_factor&id=[% HTML.url(factor.id) %]">[% HTML.escape(factor.description) %]</a></td>
-    <td>[% HTML.escape(factor.factor) %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="price_factor">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="submit" class="submit" name="action" value="Add">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_price_factors_master.html b/templates/webpages/am/list_price_factors_master.html
deleted file mode 100644 (file)
index ff560d6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="80%"><translate>Description</translate></td>
-    <td class="listheading" width="20%"><translate>Factor</translate></td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF factor.previous_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.previous_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF factor.next_id %]<a href="[% url_base %]&action=swap_price_factors&id1=[% HTML.url(factor.next_id) %]&id2=[% HTML.url(factor.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_price_factor&id=[% HTML.url(factor.id) %]">[% HTML.escape(factor.description) %]</a></td>
-    <td>[% HTML.escape(factor.factor) %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="price_factor">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_tax.html b/templates/webpages/am/list_tax.html
new file mode 100644 (file)
index 0000000..3d24b51
--- /dev/null
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <table>
+  <tr>
+   <th class="listheading">[% 'tax_taxkey' | $T8 %]</th>
+   <th class="listheading">[% 'tax_taxdescription' | $T8 %]</th>
+   <th class="listheading">[% 'tax_rate' | $T8 %]</th>
+   <th class="listheading">[% 'taxnumber' | $T8 %]</th>
+   <th class="listheading">[% 'account_description' | $T8 %]</th>
+  </tr>
+
+  [% SET row_odd = '1' %][% FOREACH row = TAX %]
+  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+   <td align="right">[% HTML.escape(row.taxkey) %]</td>
+   <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
+   <td align="right">[% HTML.escape(row.rate) %] %</td>
+   <td align="right">[% HTML.escape(row.taxnumber) %]</td>
+   <td>[% HTML.escape(row.account_description) %]</td>
+  </tr>
+  [% END %]
+ </table>
+
+ <p>
+  <form method="post" action="am.pl">
+
+   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+   <input type="hidden" name="type" value="tax">
+   <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
+
diff --git a/templates/webpages/am/list_tax_de.html b/templates/webpages/am/list_tax_de.html
deleted file mode 100644 (file)
index 39c66a5..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <table>
-  <tr>
-   <th class="listheading">Steuerschlüssel</th>
-   <th class="listheading">Steuername</th>
-   <th class="listheading">Prozent</th>
-   <th class="listheading">Automatikkonto</th>
-   <th class="listheading">Beschreibung</th>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = TAX %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-   <td align="right">[% HTML.escape(row.taxkey) %]</td>
-   <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
-   <td align="right">[% HTML.escape(row.rate) %] %</td>
-   <td align="right">[% HTML.escape(row.taxnumber) %]</td>
-   <td>[% HTML.escape(row.account_description) %]</td>
-  </tr>
-  [% END %]
- </table>
-
- <p>
-  <form method="post" action="am.pl">
-
-   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="type" value="tax">
-   <input class="submit" type="submit" name="action" value="Erfassen">
-  </form>
- </p>
-
-</body>
-</html>
-
diff --git a/templates/webpages/am/list_tax_en.html b/templates/webpages/am/list_tax_en.html
deleted file mode 100644 (file)
index 8184c5f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <table>
-  <tr>
-   <th class="listheading">tax_taxkey</th>
-   <th class="listheading">tax_taxdescription</th>
-   <th class="listheading">tax_rate</th>
-   <th class="listheading">taxnumber</th>
-   <th class="listheading">account_description</th>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = TAX %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-   <td align="right">[% HTML.escape(row.taxkey) %]</td>
-   <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
-   <td align="right">[% HTML.escape(row.rate) %] %</td>
-   <td align="right">[% HTML.escape(row.taxnumber) %]</td>
-   <td>[% HTML.escape(row.account_description) %]</td>
-  </tr>
-  [% END %]
- </table>
-
- <p>
-  <form method="post" action="am.pl">
-
-   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="type" value="tax">
-   <input class="submit" type="submit" name="action" value="Add">
-  </form>
- </p>
-
-</body>
-</html>
-
diff --git a/templates/webpages/am/list_tax_master.html b/templates/webpages/am/list_tax_master.html
deleted file mode 100644 (file)
index 8c56512..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% title %]</div>
-
- <table>
-  <tr>
-   <th class="listheading"><translate>tax_taxkey</translate></th>
-   <th class="listheading"><translate>tax_taxdescription</translate></th>
-   <th class="listheading"><translate>tax_rate</translate></th>
-   <th class="listheading"><translate>taxnumber</translate></th>
-   <th class="listheading"><translate>account_description</translate></th>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = TAX %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-   <td align="right">[% HTML.escape(row.taxkey) %]</td>
-   <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
-   <td align="right">[% HTML.escape(row.rate) %] %</td>
-   <td align="right">[% HTML.escape(row.taxnumber) %]</td>
-   <td>[% HTML.escape(row.account_description) %]</td>
-  </tr>
-  [% END %]
- </table>
-
- <p>
-  <form method="post" action="am.pl">
-
-   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-   <input type="hidden" name="type" value="tax">
-   <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
-  </form>
- </p>
-
-</body>
-</html>
-
diff --git a/templates/webpages/am/list_warehouses.html b/templates/webpages/am/list_warehouses.html
new file mode 100644 (file)
index 0000000..843abe5
--- /dev/null
@@ -0,0 +1,41 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
+
+ <div class="listtop">[% title %]</div>
+
+ <p>
+  <table width="100%">
+   <tr>
+    <td class="listheading" width="0%"></td>
+    <td class="listheading" width="0%"></td>
+    <td class="listheading" width="70%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Number of bins' | $T8 %]</td>
+    <td class="listheading" width="10%">[% 'Invalid' | $T8 %]</td>
+   </tr>
+
+   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
+   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+    <td>[% IF warehouse.previous_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.previous_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
+    <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
+    <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
+    <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
+    <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+   </tr>
+   [% END %]
+  </table>
+ </p>
+
+ <hr height="3">
+
+ <p>
+  <form method="post" action="am.pl">
+   <input type="hidden" name="type" value="warehouse">
+
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
+  </form>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/am/list_warehouses_de.html b/templates/webpages/am/list_warehouses_de.html
deleted file mode 100644 (file)
index 5f31c55..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="70%">Beschreibung</td>
-    <td class="listheading" width="20%">Anzahl Lagerpl&auml;tze</td>
-    <td class="listheading" width="10%">Ung&uuml;ltig</td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF warehouse.previous_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.previous_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
-    <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
-    <td>[% IF warehouse.invalid %]Ja[% ELSE %]Nein[% END %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="warehouse">
-
-   <input type="submit" class="submit" name="action" value="Erfassen">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_warehouses_en.html b/templates/webpages/am/list_warehouses_en.html
deleted file mode 100644 (file)
index a21f4b2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="70%">Description</td>
-    <td class="listheading" width="20%">Number of bins</td>
-    <td class="listheading" width="10%">Invalid</td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF warehouse.previous_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.previous_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
-    <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
-    <td>[% IF warehouse.invalid %]Yes[% ELSE %]No[% END %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="warehouse">
-
-   <input type="submit" class="submit" name="action" value="Add">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/am/list_warehouses_master.html b/templates/webpages/am/list_warehouses_master.html
deleted file mode 100644 (file)
index c9859c7..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="0%"></td>
-    <td class="listheading" width="70%"><translate>Description</translate></td>
-    <td class="listheading" width="20%"><translate>Number of bins</translate></td>
-    <td class="listheading" width="10%"><translate>Invalid</translate></td>
-   </tr>
-
-   [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
-   <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-    <td>[% IF warehouse.previous_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.previous_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/up.png"></a>[% END %]</td>
-    <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
-    <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
-    <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
-    <td>[% IF warehouse.invalid %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %]</td>
-   </tr>
-   [% END %]
-  </table>
- </p>
-
- <hr height="3">
-
- <p>
-  <form method="post" action="am.pl">
-   <input type="hidden" name="type" value="warehouse">
-
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
-  </form>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/display_cvar_config_form.html b/templates/webpages/amcvar/display_cvar_config_form.html
new file mode 100644 (file)
index 0000000..104b46f
--- /dev/null
@@ -0,0 +1,150 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="document.Form.name.focus();">
+
+ <style type="text/css">
+  .small {
+    font-size: 0.75em;
+  }
+ </style>
+
+ <div class="listtop">[% title %]</div>
+
+ <form action="amcvar.pl" name="Form" method="post">
+
+  <p>
+   <table>
+    <tr>
+     <td align="right">[% 'Module' | $T8 %]</td>
+     <td>
+      [%- INCLUDE generic/multibox.html
+            name      = 'module',
+            id_key    = 'module',
+            label_key = 'description',
+            DATA      = MODULES %]
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Name' | $T8 %]<sup><span class="small">(1)</span></sup></td>
+     <td><input name="name" value="[% HTML.escape(name) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Description' | $T8 %]<sup><span class="small">(2)</span></sup></td>
+     <td><input name="description" value="[% HTML.escape(description) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Type' | $T8 %]</td>
+     <td>
+      <select name="type">
+       [%- FOREACH row = TYPES %]
+       <option value="[% HTML.escape(row.type) %]"[% IF row.type == type %] selected[% END %]>[% HTML.escape(row.type_tr) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Default value' | $T8 %]<sup><span class="small">(3)</span></sup></td>
+     <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Options' | $T8 %]<sup><span class="small">(4)</span></sup></td>
+     <td><input name="options" value="[% HTML.escape(options) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Searchable' | $T8 %]<sup><span class="small"></span></sup></td>
+     <td>
+      <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
+      <label for="searchable_1">[% 'Yes' | $T8 %]</label>
+      <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
+      <label for="searchable_0">[% 'No' | $T8 %]</label>
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Includeable in reports' | $T8 %]<sup><span class="small"></span></sup></td>
+     <td>
+      <select name="inclusion">
+       <option value="no"[% UNLESS includeable %] selected[% END %]>[% 'No' | $T8 %]</option>
+       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>[% 'Yes' | $T8 %]</option>
+       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>[% 'Yes, included by default' | $T8 %]</option>
+      </select>
+     </td>
+    </tr>
+
+    [%- IF module == 'IC' %]
+    <tr>
+     <td align="right">[% 'Editable' | $T8 %]<sup><span class="small">(5)</span></sup></td>
+     <td>
+      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
+      <label for="flag_editable_1">[% 'Yes' | $T8 %]</label>
+      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
+      <label for="flag_editable_0">[% 'No' | $T8 %]</label>
+     </td>
+    </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+
+  <p>
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+   [%- IF id %]
+   <input type="submit" name="action" value="[% 'Delete' | $T8 %]">
+   [%- END %]
+  </p>
+
+  <hr>
+
+  <h3>[% 'Annotations' | $T8 %]</h3>
+
+  <p>
+   (1) [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]
+  </p>
+
+  <p>
+   (2) [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]
+  </p>
+
+  <p>
+   (3) [% 'The default value depends on the variable type:' | $T8 %]
+   <br>
+   <ul>
+    <li>[%- 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]</li>
+    <li>[%- 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
+    <li>[%- 'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
+   </ul>
+  </p>
+
+  <p>
+   (4) [% 'The available options depend on the varibale type:' | $T8 %]
+   <br>
+   <ul>
+    <li>[%- 'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' | $T8 %]</li>
+    <li>[%- 'Text field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]</li>
+    <li>[%- 'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
+    <li>[%- 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' | $T8 %]</li>
+   </ul>
+   <br>
+   [% 'Other values are ignored.' | $T8 %]
+  </p>
+
+  [%- IF module == 'IC' %]
+  <p>
+   (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 %]
+  </p>
+  [%- END %]
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/amcvar/display_cvar_config_form_de.html b/templates/webpages/amcvar/display_cvar_config_form_de.html
deleted file mode 100644 (file)
index 20ee21d..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body onload="document.Form.name.focus();">
-
- <style type="text/css">
-  .small {
-    font-size: 0.75em;
-  }
- </style>
-
- <div class="listtop">[% title %]</div>
-
- <form action="amcvar.pl" name="Form" method="post">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Modul</td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'module',
-            id_key    = 'module',
-            label_key = 'description',
-            DATA      = MODULES %]
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Name<sup><span class="small">(1)</span></sup></td>
-     <td><input name="name" value="[% HTML.escape(name) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Beschreibung<sup><span class="small">(2)</span></sup></td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Typ</td>
-     <td>
-      <select name="type">
-       [%- FOREACH row = TYPES %]
-       <option value="[% HTML.escape(row.type) %]"[% IF row.type == type %] selected[% END %]>[% HTML.escape(row.type_tr) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Standardwert<sup><span class="small">(3)</span></sup></td>
-     <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Optionen<sup><span class="small">(4)</span></sup></td>
-     <td><input name="options" value="[% HTML.escape(options) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Durchsuchbar<sup><span class="small"></span></sup></td>
-     <td>
-      <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
-      <label for="searchable_1">Ja</label>
-      <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
-      <label for="searchable_0">Nein</label>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">In Berichten anzeigbar<sup><span class="small"></span></sup></td>
-     <td>
-      <select name="inclusion">
-       <option value="no"[% UNLESS includeable %] selected[% END %]>Nein</option>
-       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>Ja</option>
-       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>Ja, standardm&auml;&szlig;ig an</option>
-      </select>
-     </td>
-    </tr>
-
-    [%- IF module == 'IC' %]
-    <tr>
-     <td align="right">Bearbeitbar<sup><span class="small">(5)</span></sup></td>
-     <td>
-      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
-      <label for="flag_editable_1">Ja</label>
-      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
-      <label for="flag_editable_0">Nein</label>
-     </td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <p>
-   <input type="submit" name="action" value="Speichern">
-   [%- IF id %]
-   <input type="submit" name="action" value="Löschen">
-   [%- END %]
-  </p>
-
-  <hr>
-
-  <h3>Anmerkungen</h3>
-
-  <p>
-   (1) Der Variablenname darf nur aus Zeichen (keine Umlaute), Ziffern und Unterstrichen bestehen. Er muss mit einem Buchstaben beginnen. Beispiel: weihnachtsgruss_verschicken
-  </p>
-
-  <p>
-   (2) Die Beschreibung wird in der jeweiligen Maske angezeigt. Sie sollte kurz und pr&auml;gnant sein.
-  </p>
-
-  <p>
-   (3) Die Bedeutung des Standardwertes h&auml;ngt vom Variablentypen ab:
-   <br>
-   <ul>
-    <li>Textzeilen, Textfelder und Zahlenvariablen: Der Standardwert wird so wie er ist &uuml;bernommen.</li>
-    <li>Ja/Nein-Variablen: Wenn der Standardwert nicht leer ist, so wird die Checkbox standardm&auml;&szlig;ig angehakt.</li>
-    <li>Datums- und Uhrzeitvariablen: Wenn der Standardwert 'NOW' ist, so wird das aktuelle Datum/die aktuelle Uhrzeit eingef&uuml;gt. Andernfalls wird der Standardwert so wie er ist benutzt.</li>
-   </ul>
-  </p>
-
-  <p>
-   (4) Die verf&uuml;gbaren Optionen h&auml;ngen vom Variablentypen ab:
-   <br>
-   <ul>
-    <li>Textzeilen: 'MAXLENGTH=n' setzt eine Maximall&auml;nge von n Zeichen.</li>
-    <li>Textfelder: 'WIDTH=w HEIGHT=h' setzen die Breite und die H&ouml;he des Textfeldes. Wenn nicht anders angegeben, so werden sie 30 Zeichen breit und f&uuml;nf Zeichen hoch dargestellt.</li>
-    <li>Zahlenvariablen: Mit 'PRECISION=n' erzwingt man, dass Zahlen mit n Nachkommastellen formatiert werden.</li>
-    <li>Auswahlboxen: Das Optionenfeld muss die f&uuml;r die Auswahl verf&uuml;gbaren Eintr&auml;ge enthalten. Die Eintr&auml;ge werden mit '##' voneinander getrennt. Beispiel: 'Fr&uuml;h##Normal##Sp&auml;t'.</li>
-   </ul>
-   <br>
-   Andere Eingaben werden ignoriert.
-  </p>
-
-  [%- IF module == 'IC' %]
-  <p>
-   (5)
-
-   Eine als 'editierbar' markierte Variable kann in jedem Angebot, Auftrag, jeder Rechnung etc für jede Position geändert werden.
-
-   Andernfalls steht die Variable nur beim Ausdruck zur Verfügung.
-  </p>
-  [%- END %]
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/display_cvar_config_form_en.html b/templates/webpages/amcvar/display_cvar_config_form_en.html
deleted file mode 100644 (file)
index 3db46e7..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body onload="document.Form.name.focus();">
-
- <style type="text/css">
-  .small {
-    font-size: 0.75em;
-  }
- </style>
-
- <div class="listtop">[% title %]</div>
-
- <form action="amcvar.pl" name="Form" method="post">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Module</td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'module',
-            id_key    = 'module',
-            label_key = 'description',
-            DATA      = MODULES %]
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Name<sup><span class="small">(1)</span></sup></td>
-     <td><input name="name" value="[% HTML.escape(name) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Description<sup><span class="small">(2)</span></sup></td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Type</td>
-     <td>
-      <select name="type">
-       [%- FOREACH row = TYPES %]
-       <option value="[% HTML.escape(row.type) %]"[% IF row.type == type %] selected[% END %]>[% HTML.escape(row.type_tr) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Default value<sup><span class="small">(3)</span></sup></td>
-     <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Options<sup><span class="small">(4)</span></sup></td>
-     <td><input name="options" value="[% HTML.escape(options) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Searchable<sup><span class="small"></span></sup></td>
-     <td>
-      <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
-      <label for="searchable_1">Yes</label>
-      <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
-      <label for="searchable_0">No</label>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Includeable in reports<sup><span class="small"></span></sup></td>
-     <td>
-      <select name="inclusion">
-       <option value="no"[% UNLESS includeable %] selected[% END %]>No</option>
-       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>Yes</option>
-       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>Yes, included by default</option>
-      </select>
-     </td>
-    </tr>
-
-    [%- IF module == 'IC' %]
-    <tr>
-     <td align="right">Editable<sup><span class="small">(5)</span></sup></td>
-     <td>
-      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
-      <label for="flag_editable_1">Yes</label>
-      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
-      <label for="flag_editable_0">No</label>
-     </td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <p>
-   <input type="submit" name="action" value="Save">
-   [%- IF id %]
-   <input type="submit" name="action" value="Delete">
-   [%- END %]
-  </p>
-
-  <hr>
-
-  <h3>Annotations</h3>
-
-  <p>
-   (1) The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present
-  </p>
-
-  <p>
-   (2) The description is shown on the form. Chose something short and descriptive.
-  </p>
-
-  <p>
-   (3) The default value depends on the variable type:
-   <br>
-   <ul>
-    <li>Text, text field and number variables: The default value will be used as-is.</li>
-    <li>Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.</li>
-    <li>Date and timestamp variables: If the default value equals 'NOW' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.</li>
-   </ul>
-  </p>
-
-  <p>
-   (4) The available options depend on the varibale type:
-   <br>
-   <ul>
-    <li>Text variables: 'MAXLENGTH=n' sets the maximum entry length to 'n'.</li>
-    <li>Text field variables: 'WIDTH=w HEIGHT=h' sets the width and height of the text field. They default to 30 and 5 respectively.</li>
-    <li>Number variables: 'PRECISION=n' forces numbers to be shown with exactly n decimal places.</li>
-    <li>Selection fields: The option field must contain the available options for the selection. Options are separated by '##', for example 'Early##Normal##Late'.</li>
-   </ul>
-   <br>
-   Other values are ignored.
-  </p>
-
-  [%- IF module == 'IC' %]
-  <p>
-   (5)
-
-   A variable marked as 'editable' can be changed in each quotation, order, invoice etc.
-
-   Otherwise the variable is only available for printing.
-  </p>
-  [%- END %]
-
- </form>
-
-</body>
-</html>
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 (file)
index 3f6fa83..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-[% USE HTML %]<body onload="document.Form.name.focus();">
-
- <style type="text/css">
-  .small {
-    font-size: 0.75em;
-  }
- </style>
-
- <div class="listtop">[% title %]</div>
-
- <form action="amcvar.pl" name="Form" method="post">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right"><translate>Module</translate></td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'module',
-            id_key    = 'module',
-            label_key = 'description',
-            DATA      = MODULES %]
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Name</translate><sup><span class="small">(1)</span></sup></td>
-     <td><input name="name" value="[% HTML.escape(name) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Description</translate><sup><span class="small">(2)</span></sup></td>
-     <td><input name="description" value="[% HTML.escape(description) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Type</translate></td>
-     <td>
-      <select name="type">
-       [%- FOREACH row = TYPES %]
-       <option value="[% HTML.escape(row.type) %]"[% IF row.type == type %] selected[% END %]>[% HTML.escape(row.type_tr) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Default value</translate><sup><span class="small">(3)</span></sup></td>
-     <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Options</translate><sup><span class="small">(4)</span></sup></td>
-     <td><input name="options" value="[% HTML.escape(options) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Searchable</translate><sup><span class="small"></span></sup></td>
-     <td>
-      <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
-      <label for="searchable_1"><translate>Yes</translate></label>
-      <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
-      <label for="searchable_0"><translate>No</translate></label>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Includeable in reports</translate><sup><span class="small"></span></sup></td>
-     <td>
-      <select name="inclusion">
-       <option value="no"[% UNLESS includeable %] selected[% END %]><translate>No</translate></option>
-       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]><translate>Yes</translate></option>
-       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]><translate>Yes, included by default</translate></option>
-      </select>
-     </td>
-    </tr>
-
-    [%- IF module == 'IC' %]
-    <tr>
-     <td align="right"><translate>Editable</translate><sup><span class="small">(5)</span></sup></td>
-     <td>
-      <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
-      <label for="flag_editable_1"><translate>Yes</translate></label>
-      <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
-      <label for="flag_editable_0"><translate>No</translate></label>
-     </td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
-  <p>
-   <input type="submit" name="action" value="<translate>Save</translate>">
-   [%- IF id %]
-   <input type="submit" name="action" value="<translate>Delete</translate>">
-   [%- END %]
-  </p>
-
-  <hr>
-
-  <h3><translate>Annotations</translate></h3>
-
-  <p>
-   (1) <translate>The variable name must only consist of letters,
-    numbers and underscores. It must begin with a letter. Example:
-    send_christmas_present</translate>
-  </p>
-
-  <p>
-   (2) <translate>The description is shown on the form. Chose
-    something short and descriptive.</translate>
-  </p>
-
-  <p>
-   (3) <translate>The default value depends on the variable type:</translate>
-   <br>
-   <ul>
-    <li><translate>Text, text field and number variables: The default
-      value will be used as-is.</translate></li>
-    <li><translate>Boolean variables: If the default value is
-      non-empty then the checkbox will be checked by default and
-      unchecked otherwise.</translate></li>
-    <li><translate>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.</translate></li>
-   </ul>
-  </p>
-
-  <p>
-   (4) <translate>The available options depend on the varibale
-    type:</translate>
-   <br>
-   <ul>
-    <li><translate>Text variables: 'MAXLENGTH=n' sets the maximum
-      entry length to 'n'.</translate></li>
-    <li><translate>Text field variables: 'WIDTH=w HEIGHT=h' sets the
-      width and height of the text field. They default to 30 and 5
-      respectively.</translate></li>
-    <li><translate>Number variables: 'PRECISION=n' forces numbers to
-      be shown with exactly n decimal places.</translate></li>
-    <li><translate>Selection fields: The option field must contain the
-      available options for the selection. Options are separated by
-      '##', for example 'Early##Normal##Late'.</translate></li>
-   </ul>
-   <br>
-   <translate>Other values are ignored.</translate>
-  </p>
-
-  [%- IF module == 'IC' %]
-  <p>
-   (5)
-
-   <translate>A variable marked as 'editable' can be changed in each
-    quotation, order, invoice etc.</translate>
-
-   <translate>Otherwise the variable is only available for
-    printing.</translate>
-  </p>
-  [%- END %]
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/list_cvar_configs.html b/templates/webpages/amcvar/list_cvar_configs.html
new file mode 100644 (file)
index 0000000..f2890f7
--- /dev/null
@@ -0,0 +1,102 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="amcvar.pl">
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <p>
+   [% 'Custom variables for module' | $T8 %]
+   [%- INCLUDE generic/multibox.html
+         name      = 'module',
+         id_key    = 'module',
+         label_key = 'description',
+         DATA      = MODULES %]
+   <input type="submit" class="submit" name="action_list_cvar_configs" value="[% 'Show' | $T8 %]">
+  </p>
+
+  <p>
+   <table width="100%">
+    <tr>
+     <td class="listheading" width="0%"></td>
+     <td class="listheading" width="0%"></td>
+     <td class="listheading" width="20%">[% 'Name' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Description' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Type' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Searchable' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Includeable in reports' | $T8 %]</td>
+     [%- IF module == 'IC' %]
+     <td class="listheading" width="20%">[% 'Editable' | $T8 %]</td>
+     [%- END %]
+    </tr>
+
+    [%- FOREACH cfg = CONFIGS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <td>
+      [%- IF cfg.previous_id %]
+      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.previous_id) %]&id2=[% HTML.url(cfg.id) %]">
+       <img border="0" src="image/up.png"></a>
+      [%- END %]
+     </td>
+
+     <td>
+      [%- IF cfg.next_id %]
+      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.next_id) %]&id2=[% HTML.url(cfg.id) %]">
+       <img border="0" src="image/down.png"></a>
+      [%- END %]
+     </td>
+
+     <td>
+      <a href="amcvar.pl?action=edit_cvar_config&module=[% HTML.url(module) %]&id=[% HTML.url(cfg.id) %]&callback=[% HTML.url(callback) %]">
+       [% HTML.escape(cfg.name) %]
+      </a>
+     </td>
+
+     <td>[% HTML.escape(cfg.description) %]</td>
+     <td>[% HTML.escape(cfg.type_tr) %]</td>
+
+     <td>
+      [%- IF cfg.searchable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     </td>
+
+     <td>
+      [%- IF cfg.included_by_default %]
+      [% 'Yes, included by default' | $T8 %]
+      [%- ELSIF cfg.includeable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     </td>
+
+     [%- IF module == 'IC' %]
+     <td>
+      [%- IF cfg.flag_editable %]
+      [% 'Yes' | $T8 %]
+      [%- ELSE %]
+      [% 'No' | $T8 %]
+      [%- END %]
+     </td>
+     [%- END %]
+    </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  <hr height="3">
+
+  <p>
+   <input type="submit" class="submit" name="action_add_cvar_config" value="[% 'Add' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/amcvar/list_cvar_configs_de.html b/templates/webpages/amcvar/list_cvar_configs_de.html
deleted file mode 100644 (file)
index 8174830..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="amcvar.pl">
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <p>
-   Benutzerdefinierte Variablen für Modul
-   [%- INCLUDE generic/multibox.html
-         name      = 'module',
-         id_key    = 'module',
-         label_key = 'description',
-         DATA      = MODULES %]
-   <input type="submit" class="submit" name="action_list_cvar_configs" value="Zeigen">
-  </p>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="20%">Name</td>
-     <td class="listheading" width="20%">Beschreibung</td>
-     <td class="listheading" width="20%">Typ</td>
-     <td class="listheading" width="20%">Durchsuchbar</td>
-     <td class="listheading" width="20%">In Berichten anzeigbar</td>
-     [%- IF module == 'IC' %]
-     <td class="listheading" width="20%">Bearbeitbar</td>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH cfg = CONFIGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      [%- IF cfg.previous_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.previous_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/up.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.next_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.next_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/down.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      <a href="amcvar.pl?action=edit_cvar_config&module=[% HTML.url(module) %]&id=[% HTML.url(cfg.id) %]&callback=[% HTML.url(callback) %]">
-       [% HTML.escape(cfg.name) %]
-      </a>
-     </td>
-
-     <td>[% HTML.escape(cfg.description) %]</td>
-     <td>[% HTML.escape(cfg.type_tr) %]</td>
-
-     <td>
-      [%- IF cfg.searchable %]
-      Ja
-      [%- ELSE %]
-      Nein
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.included_by_default %]
-      Ja, standardm&auml;&szlig;ig an
-      [%- ELSIF cfg.includeable %]
-      Ja
-      [%- ELSE %]
-      Nein
-      [%- END %]
-     </td>
-
-     [%- IF module == 'IC' %]
-     <td>
-      [%- IF cfg.flag_editable %]
-      Ja
-      [%- ELSE %]
-      Nein
-      [%- END %]
-     </td>
-     [%- END %]
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <hr height="3">
-
-  <p>
-   <input type="submit" class="submit" name="action_add_cvar_config" value="Erfassen">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/list_cvar_configs_en.html b/templates/webpages/amcvar/list_cvar_configs_en.html
deleted file mode 100644 (file)
index 024a81c..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="amcvar.pl">
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <p>
-   Custom variables for module
-   [%- INCLUDE generic/multibox.html
-         name      = 'module',
-         id_key    = 'module',
-         label_key = 'description',
-         DATA      = MODULES %]
-   <input type="submit" class="submit" name="action_list_cvar_configs" value="Show">
-  </p>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="20%">Name</td>
-     <td class="listheading" width="20%">Description</td>
-     <td class="listheading" width="20%">Type</td>
-     <td class="listheading" width="20%">Searchable</td>
-     <td class="listheading" width="20%">Includeable in reports</td>
-     [%- IF module == 'IC' %]
-     <td class="listheading" width="20%">Editable</td>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH cfg = CONFIGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      [%- IF cfg.previous_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.previous_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/up.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.next_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.next_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/down.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      <a href="amcvar.pl?action=edit_cvar_config&module=[% HTML.url(module) %]&id=[% HTML.url(cfg.id) %]&callback=[% HTML.url(callback) %]">
-       [% HTML.escape(cfg.name) %]
-      </a>
-     </td>
-
-     <td>[% HTML.escape(cfg.description) %]</td>
-     <td>[% HTML.escape(cfg.type_tr) %]</td>
-
-     <td>
-      [%- IF cfg.searchable %]
-      Yes
-      [%- ELSE %]
-      No
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.included_by_default %]
-      Yes, included by default
-      [%- ELSIF cfg.includeable %]
-      Yes
-      [%- ELSE %]
-      No
-      [%- END %]
-     </td>
-
-     [%- IF module == 'IC' %]
-     <td>
-      [%- IF cfg.flag_editable %]
-      Yes
-      [%- ELSE %]
-      No
-      [%- END %]
-     </td>
-     [%- END %]
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <hr height="3">
-
-  <p>
-   <input type="submit" class="submit" name="action_add_cvar_config" value="Add">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/list_cvar_configs_master.html b/templates/webpages/amcvar/list_cvar_configs_master.html
deleted file mode 100644 (file)
index 385fb44..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %]<body>
-
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="amcvar.pl">
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <p>
-   <translate>Custom variables for module</translate>
-   [%- INCLUDE generic/multibox.html
-         name      = 'module',
-         id_key    = 'module',
-         label_key = 'description',
-         DATA      = MODULES %]
-   <input type="submit" class="submit" name="action_list_cvar_configs" value="<translate>Show</translate>">
-  </p>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="0%"></td>
-     <td class="listheading" width="20%"><translate>Name</translate></td>
-     <td class="listheading" width="20%"><translate>Description</translate></td>
-     <td class="listheading" width="20%"><translate>Type</translate></td>
-     <td class="listheading" width="20%"><translate>Searchable</translate></td>
-     <td class="listheading" width="20%"><translate>Includeable in reports</translate></td>
-     [%- IF module == 'IC' %]
-     <td class="listheading" width="20%"><translate>Editable</translate></td>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH cfg = CONFIGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      [%- IF cfg.previous_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.previous_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/up.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.next_id %]
-      <a href="amcvar.pl?action=swap_cvar_configs&module=[% HTML.url(module) %]&id1=[% HTML.url(cfg.next_id) %]&id2=[% HTML.url(cfg.id) %]">
-       <img border="0" src="image/down.png"></a>
-      [%- END %]
-     </td>
-
-     <td>
-      <a href="amcvar.pl?action=edit_cvar_config&module=[% HTML.url(module) %]&id=[% HTML.url(cfg.id) %]&callback=[% HTML.url(callback) %]">
-       [% HTML.escape(cfg.name) %]
-      </a>
-     </td>
-
-     <td>[% HTML.escape(cfg.description) %]</td>
-     <td>[% HTML.escape(cfg.type_tr) %]</td>
-
-     <td>
-      [%- IF cfg.searchable %]
-      <translate>Yes</translate>
-      [%- ELSE %]
-      <translate>No</translate>
-      [%- END %]
-     </td>
-
-     <td>
-      [%- IF cfg.included_by_default %]
-      <translate>Yes, included by default</translate>
-      [%- ELSIF cfg.includeable %]
-      <translate>Yes</translate>
-      [%- ELSE %]
-      <translate>No</translate>
-      [%- END %]
-     </td>
-
-     [%- IF module == 'IC' %]
-     <td>
-      [%- IF cfg.flag_editable %]
-      <translate>Yes</translate>
-      [%- ELSE %]
-      <translate>No</translate>
-      [%- END %]
-     </td>
-     [%- END %]
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <hr height="3">
-
-  <p>
-   <input type="submit" class="submit" name="action_add_cvar_config" value="<translate>Add</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/amcvar/render_checkboxes.html b/templates/webpages/amcvar/render_checkboxes.html
new file mode 100644 (file)
index 0000000..3a703d8
--- /dev/null
@@ -0,0 +1,3 @@
+[%- USE HTML %]
+[%- SET var_valid = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) _ '_valid' -%]
+<input type=checkbox name='[% var_valid %]'[% IF var.valid %] checked[% END %]>
diff --git a/templates/webpages/amcvar/render_checkboxes_de.html b/templates/webpages/amcvar/render_checkboxes_de.html
deleted file mode 100644 (file)
index 3a703d8..0000000
+++ /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' -%]
-<input type=checkbox name='[% var_valid %]'[% IF var.valid %] checked[% END %]>
diff --git a/templates/webpages/amcvar/render_checkboxes_en.html b/templates/webpages/amcvar/render_checkboxes_en.html
deleted file mode 100644 (file)
index 3a703d8..0000000
+++ /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' -%]
-<input type=checkbox name='[% var_valid %]'[% IF var.valid %] checked[% END %]>
diff --git a/templates/webpages/amcvar/render_checkboxes_master.html b/templates/webpages/amcvar/render_checkboxes_master.html
deleted file mode 100644 (file)
index 3a703d8..0000000
+++ /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' -%]
-<input type=checkbox name='[% var_valid %]'[% IF var.valid %] checked[% END %]>
diff --git a/templates/webpages/amcvar/render_inputs.html b/templates/webpages/amcvar/render_inputs.html
new file mode 100644 (file)
index 0000000..335a77c
--- /dev/null
@@ -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 %]
+<input type="hidden" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
+
+[%- ELSIF !var.valid %]
+  [%- IF show_disabled_message %]
+<i>[% 'Element disabled' | $T8 %]</i>
+  [%- END %]
+
+[%- ELSIF var.type == 'bool' %]
+<input type="checkbox" name="[% var_name %]" value="1"[% IF var.value %] checked[% END %]>
+
+[%- ELSIF var.type == 'textfield' %]
+<textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]">[% HTML.escape(var.value) %]</textarea>
+
+[%- ELSIF var.type == 'date' %]
+<input name="[% var_name %]" id="[% var_name %]" size="12" value="[% HTML.escape(var.value) %]">
+<input name="[% var_name %]_button" id="[% var_name %]_trigger" type="button" value="?">
+
+<script type="text/javascript">
+ <!--
+     Calendar.setup({ inputField : "[% var_name %]",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BR",
+                      button     : "[% var_name %]_trigger" });
+   -->
+</script>
+
+[%- ELSIF var.type == 'timestamp' %]
+<input name="[% var_name %]" value="[% HTML.escape(var.value) %]">
+
+[%- ELSIF var.type == 'select' %]
+
+<select name="[% var_name %]">
+ [%- FOREACH option = var.OPTIONS %]
+ <option[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
+ [%- END %]
+</select>
+
+[%- ELSE %]
+<input name="[% var_name %]" value="[% HTML.escape(var.value) %]" [%- IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END -%]>
+[%- END %]
diff --git a/templates/webpages/amcvar/render_inputs_de.html b/templates/webpages/amcvar/render_inputs_de.html
deleted file mode 100644 (file)
index 50fb4cb..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% 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 %]
-<input type="hidden" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF !var.valid %]
-  [%- IF show_disabled_message %]
-<i>Element deaktiviert</i>
-  [%- END %]
-
-[%- ELSIF var.type == 'bool' %]
-<input type="checkbox" name="[% var_name %]" value="1"[% IF var.value %] checked[% END %]>
-
-[%- ELSIF var.type == 'textfield' %]
-<textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]">[% HTML.escape(var.value) %]</textarea>
-
-[%- ELSIF var.type == 'date' %]
-<input name="[% var_name %]" id="[% var_name %]" size="12" value="[% HTML.escape(var.value) %]">
-<input name="[% var_name %]_button" id="[% var_name %]_trigger" type="button" value="?">
-
-<script type="text/javascript">
- <!--
-     Calendar.setup({ inputField : "[% var_name %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BR",
-                      button     : "[% var_name %]_trigger" });
-   -->
-</script>
-
-[%- ELSIF var.type == 'timestamp' %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF var.type == 'select' %]
-
-<select name="[% var_name %]">
- [%- FOREACH option = var.OPTIONS %]
- <option[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
- [%- END %]
-</select>
-
-[%- ELSE %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]" [%- IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END -%]>
-[%- END %]
diff --git a/templates/webpages/amcvar/render_inputs_en.html b/templates/webpages/amcvar/render_inputs_en.html
deleted file mode 100644 (file)
index 60bab14..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% 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 %]
-<input type="hidden" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF !var.valid %]
-  [%- IF show_disabled_message %]
-<i>Element disabled</i>
-  [%- END %]
-
-[%- ELSIF var.type == 'bool' %]
-<input type="checkbox" name="[% var_name %]" value="1"[% IF var.value %] checked[% END %]>
-
-[%- ELSIF var.type == 'textfield' %]
-<textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]">[% HTML.escape(var.value) %]</textarea>
-
-[%- ELSIF var.type == 'date' %]
-<input name="[% var_name %]" id="[% var_name %]" size="12" value="[% HTML.escape(var.value) %]">
-<input name="[% var_name %]_button" id="[% var_name %]_trigger" type="button" value="?">
-
-<script type="text/javascript">
- <!--
-     Calendar.setup({ inputField : "[% var_name %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BR",
-                      button     : "[% var_name %]_trigger" });
-   -->
-</script>
-
-[%- ELSIF var.type == 'timestamp' %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF var.type == 'select' %]
-
-<select name="[% var_name %]">
- [%- FOREACH option = var.OPTIONS %]
- <option[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
- [%- END %]
-</select>
-
-[%- ELSE %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]" [%- IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END -%]>
-[%- END %]
diff --git a/templates/webpages/amcvar/render_inputs_master.html b/templates/webpages/amcvar/render_inputs_master.html
deleted file mode 100644 (file)
index ed746a5..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% 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 %]
-<input type="hidden" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF !var.valid %]
-  [%- IF show_disabled_message %]
-<i><translate>Element disabled</translate></i>
-  [%- END %]
-
-[%- ELSIF var.type == 'bool' %]
-<input type="checkbox" name="[% var_name %]" value="1"[% IF var.value %] checked[% END %]>
-
-[%- ELSIF var.type == 'textfield' %]
-<textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]">[% HTML.escape(var.value) %]</textarea>
-
-[%- ELSIF var.type == 'date' %]
-<input name="[% var_name %]" id="[% var_name %]" size="12" value="[% HTML.escape(var.value) %]">
-<input name="[% var_name %]_button" id="[% var_name %]_trigger" type="button" value="?">
-
-<script type="text/javascript">
- <!--
-     Calendar.setup({ inputField : "[% var_name %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BR",
-                      button     : "[% var_name %]_trigger" });
-   -->
-</script>
-
-[%- ELSIF var.type == 'timestamp' %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]">
-
-[%- ELSIF var.type == 'select' %]
-
-<select name="[% var_name %]">
- [%- FOREACH option = var.OPTIONS %]
- <option[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
- [%- END %]
-</select>
-
-[%- ELSE %]
-<input name="[% var_name %]" value="[% HTML.escape(var.value) %]" [%- IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END -%]>
-[%- END %]
diff --git a/templates/webpages/amcvar/search_filter.html b/templates/webpages/amcvar/search_filter.html
new file mode 100644 (file)
index 0000000..0bf105e
--- /dev/null
@@ -0,0 +1,71 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+   [%- FOREACH var = variables %]
+   [%- IF var.searchable %]
+   <tr id='cvar_filter_[% var.name %]'>
+    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
+    <td valign="top">
+
+     [%- IF var.type == 'bool' %]
+     <select name="cvar_[% HTML.escape(var.name) %]">
+      <option value="">---</option>
+      <option value="yes">[% 'Yes' | $T8 %]</option>
+      <option value="no">[% 'No' | $T8 %]</option>
+     </select>
+
+     [%- ELSIF var.type == 'date' %]
+     [% 'from (time)' | $T8 %]
+     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
+     <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
+     [% 'to (time)' | $T8 %]
+     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
+     <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
+
+     <script type="text/javascript">
+      <!--
+          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_from",
+                           ifFormat   :"[% myconfig_jsc_dateformat %]",
+                           align      : "BR",
+                           button     : "cvar_[% HTML.escape(var.name) %]_from_trigger" });
+          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_to",
+                           ifFormat   :"[% myconfig_jsc_dateformat %]",
+                           align      : "BR",
+                           button     : "cvar_[% HTML.escape(var.name) %]_to_trigger" });
+        -->
+     </script>
+
+     [%- ELSIF var.type == 'number' %]
+     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
+      <option selected>==</option>
+      <option>=/=</option>
+      <option>&gt;</option>
+      <option>&gt;=</option>
+      <option>&lt;</option>
+      <option>&lt;=</option>
+     </select>
+     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+
+     [% ELSIF var.type == 'select' %]
+     <select name="cvar_[% HTML.escape(var.name) %]">
+      <option value="" selected>---</option>
+      [%- FOREACH option = var.OPTIONS %]
+      <option>[% HTML.escape(option.value) %]</option>
+      [%- END %]
+     </select>
+
+     [%- ELSE %]
+     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+
+     [%- END %]
+    </td>
+   </tr>
+   [%- END %]
+   [%- END %]
+[% IF hidden_cvar_filters %]
+   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>[% 'click here to edit cvars' | $T8 %]</i></a></td></tr>
+   <script type='text/javascript'>
+     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
+     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
+   </script>
+[% END %]
diff --git a/templates/webpages/amcvar/search_filter_de.html b/templates/webpages/amcvar/search_filter_de.html
deleted file mode 100644 (file)
index f25b428..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.searchable %]
-   <tr id='cvar_filter_[% var.name %]'>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">
-
-     [%- IF var.type == 'bool' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="">---</option>
-      <option value="yes">Ja</option>
-      <option value="no">Nein</option>
-     </select>
-
-     [%- ELSIF var.type == 'date' %]
-     von
-     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     bis
-     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
-
-     <script type="text/javascript">
-      <!--
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_from",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_from_trigger" });
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_to",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_to_trigger" });
-        -->
-     </script>
-
-     [%- ELSIF var.type == 'number' %]
-     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
-      <option selected>==</option>
-      <option>=/=</option>
-      <option>&gt;</option>
-      <option>&gt;=</option>
-      <option>&lt;</option>
-      <option>&lt;=</option>
-     </select>
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [% ELSIF var.type == 'select' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="" selected>---</option>
-      [%- FOREACH option = var.OPTIONS %]
-      <option>[% HTML.escape(option.value) %]</option>
-      [%- END %]
-     </select>
-
-     [%- ELSE %]
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-   [%- END %]
-[% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>Klicken Sie hier, um nach benutzerdefinierten Variablen zu suchen</i></a></td></tr>
-   <script type='text/javascript'>
-     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
-     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
-   </script>
-[% END %]
diff --git a/templates/webpages/amcvar/search_filter_en.html b/templates/webpages/amcvar/search_filter_en.html
deleted file mode 100644 (file)
index 56e00a7..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.searchable %]
-   <tr id='cvar_filter_[% var.name %]'>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">
-
-     [%- IF var.type == 'bool' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="">---</option>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-     </select>
-
-     [%- ELSIF var.type == 'date' %]
-     from (time)
-     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     to (time)
-     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
-
-     <script type="text/javascript">
-      <!--
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_from",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_from_trigger" });
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_to",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_to_trigger" });
-        -->
-     </script>
-
-     [%- ELSIF var.type == 'number' %]
-     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
-      <option selected>==</option>
-      <option>=/=</option>
-      <option>&gt;</option>
-      <option>&gt;=</option>
-      <option>&lt;</option>
-      <option>&lt;=</option>
-     </select>
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [% ELSIF var.type == 'select' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="" selected>---</option>
-      [%- FOREACH option = var.OPTIONS %]
-      <option>[% HTML.escape(option.value) %]</option>
-      [%- END %]
-     </select>
-
-     [%- ELSE %]
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-   [%- END %]
-[% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>click here to edit cvars</i></a></td></tr>
-   <script type='text/javascript'>
-     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
-     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
-   </script>
-[% END %]
diff --git a/templates/webpages/amcvar/search_filter_master.html b/templates/webpages/amcvar/search_filter_master.html
deleted file mode 100644 (file)
index 9151d13..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.searchable %]
-   <tr id='cvar_filter_[% var.name %]'>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">
-
-     [%- IF var.type == 'bool' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="">---</option>
-      <option value="yes"><translate>Yes</translate></option>
-      <option value="no"><translate>No</translate></option>
-     </select>
-
-     [%- ELSIF var.type == 'date' %]
-     <translate>from (time)</translate>
-     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     <translate>to (time)</translate>
-     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
-
-     <script type="text/javascript">
-      <!--
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_from",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_from_trigger" });
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_to",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_to_trigger" });
-        -->
-     </script>
-
-     [%- ELSIF var.type == 'number' %]
-     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
-      <option selected>==</option>
-      <option>=/=</option>
-      <option>&gt;</option>
-      <option>&gt;=</option>
-      <option>&lt;</option>
-      <option>&lt;=</option>
-     </select>
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [% ELSIF var.type == 'select' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
-      <option value="" selected>---</option>
-      [%- FOREACH option = var.OPTIONS %]
-      <option>[% HTML.escape(option.value) %]</option>
-      [%- END %]
-     </select>
-
-     [%- ELSE %]
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
-
-     [%- END %]
-    </td>
-   </tr>
-   [%- END %]
-   [%- END %]
-[% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i><translate>click here to edit cvars</translate></i></a></td></tr>
-   <script type='text/javascript'>
-     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
-     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
-   </script>
-[% END %]
diff --git a/templates/webpages/amcvar/search_include.html b/templates/webpages/amcvar/search_include.html
new file mode 100644 (file)
index 0000000..3fd967f
--- /dev/null
@@ -0,0 +1,25 @@
+[% USE HTML %]
+
+   [%- SET start_new_row = '1' %]
+
+   [%- FOREACH var = variables %]
+   [%- IF var.includeable %]
+   [%- IF start_new_row %]
+   <tr>
+    [%- SET start_new_row = '0' %]
+    [%- END %]
+    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
+     <input type="checkbox"
+            name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
+            id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
+            value="[% HTML.escape(include_value) %]"
+            [% IF var.included_by_default %] checked[% END %]>
+     <label for="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]">[% HTML.escape(var.description) %]</label>
+    </td>
+
+    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
+    [%- IF start_new_row || loop.last %]
+   </tr>
+   [%- END %]
+   [%- END %]
+   [%- END %]
diff --git a/templates/webpages/amcvar/search_include_de.html b/templates/webpages/amcvar/search_include_de.html
deleted file mode 100644 (file)
index 3fd967f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-
-   [%- SET start_new_row = '1' %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.includeable %]
-   [%- IF start_new_row %]
-   <tr>
-    [%- SET start_new_row = '0' %]
-    [%- END %]
-    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
-     <input type="checkbox"
-            name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            value="[% HTML.escape(include_value) %]"
-            [% IF var.included_by_default %] checked[% END %]>
-     <label for="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]">[% HTML.escape(var.description) %]</label>
-    </td>
-
-    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
-    [%- IF start_new_row || loop.last %]
-   </tr>
-   [%- END %]
-   [%- END %]
-   [%- END %]
diff --git a/templates/webpages/amcvar/search_include_en.html b/templates/webpages/amcvar/search_include_en.html
deleted file mode 100644 (file)
index 3fd967f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-
-   [%- SET start_new_row = '1' %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.includeable %]
-   [%- IF start_new_row %]
-   <tr>
-    [%- SET start_new_row = '0' %]
-    [%- END %]
-    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
-     <input type="checkbox"
-            name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            value="[% HTML.escape(include_value) %]"
-            [% IF var.included_by_default %] checked[% END %]>
-     <label for="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]">[% HTML.escape(var.description) %]</label>
-    </td>
-
-    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
-    [%- IF start_new_row || loop.last %]
-   </tr>
-   [%- END %]
-   [%- END %]
-   [%- END %]
diff --git a/templates/webpages/amcvar/search_include_master.html b/templates/webpages/amcvar/search_include_master.html
deleted file mode 100644 (file)
index 3fd967f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]
-
-   [%- SET start_new_row = '1' %]
-
-   [%- FOREACH var = variables %]
-   [%- IF var.includeable %]
-   [%- IF start_new_row %]
-   <tr>
-    [%- SET start_new_row = '0' %]
-    [%- END %]
-    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
-     <input type="checkbox"
-            name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
-            value="[% HTML.escape(include_value) %]"
-            [% IF var.included_by_default %] checked[% END %]>
-     <label for="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]">[% HTML.escape(var.description) %]</label>
-    </td>
-
-    [%- UNLESS loop.count % 4 %][%- SET start_new_row = '1' %][%- END %]
-    [%- IF start_new_row || loop.last %]
-   </tr>
-   [%- END %]
-   [%- END %]
-   [%- END %]
diff --git a/templates/webpages/ap/ap_transactions_bottom.html b/templates/webpages/ap/ap_transactions_bottom.html
new file mode 100644 (file)
index 0000000..abc51a1
--- /dev/null
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML %] <form method="post" action="ap.pl">
+
+  <input name="callback" type="hidden" value="[% callback %]">
+
+  [% 'Create new' | $T8 %]<br>
+
+  <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ap/ap_transactions_bottom_de.html b/templates/webpages/ap/ap_transactions_bottom_de.html
deleted file mode 100644 (file)
index c9442d0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ap.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  Neu erfassen<br>
-
-  <input class="submit" type="submit" name="action" value="Kreditorenbuchung">
-  <input class="submit" type="submit" name="action" value="Einkaufsrechnung">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ap/ap_transactions_bottom_en.html b/templates/webpages/ap/ap_transactions_bottom_en.html
deleted file mode 100644 (file)
index cdd5693..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ap.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  Create new<br>
-
-  <input class="submit" type="submit" name="action" value="Purchase Transaction">
-  <input class="submit" type="submit" name="action" value="Vendor Invoice">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ap/ap_transactions_bottom_master.html b/templates/webpages/ap/ap_transactions_bottom_master.html
deleted file mode 100644 (file)
index 0be66fb..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ap.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  <translate>Create new</translate><br>
-
-  <input class="submit" type="submit" name="action" value="<translate>AP Transaction</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Vendor Invoice</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
new file mode 100644 (file)
index 0000000..4b11397
--- /dev/null
@@ -0,0 +1,188 @@
+[%- USE T8 %]
+<body>
+
+ <form method=post name="search" action=[% script %]>
+
+  <table width=100%>
+  <tr><th class=listtop>[% title %]</th></tr>
+  <tr height="5"></tr>
+  <tr>
+   <td>
+    <table>
+     <tr>
+      <th align=right>[% 'Vendor' | $T8 %]</th>
+      <td colspan=3>
+            [%- 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,
+                 -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
+      <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'department',
+                 style         = 'width: 250px',
+                 DATA          = ALL_DEPARTMENTS,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
+      <td colspan=3><input name=invnumber size=20></td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
+      <td colspan=3><input name=ordnumber size=20></td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
+      <td colspan=3><input name=notes size=40></td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
+      <td colspan="3">
+            [%- 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,
+            -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
+      <td>
+       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
+      </td>
+     <th align=right>[% 'Bis' | $T8 %]</th>
+     <td>
+      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
+     </td>
+    </tr>
+   <input type=hidden name=sort value=transdate>
+   </table>
+    </td>
+    </tr>
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
+        <td>
+         <table width=100%>
+          <tr>
+           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
+           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
+           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
+           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Vendor' | $T8 %]</td>
+           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
+           <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
+           <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
+           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
+           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
+           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
+           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
+           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
+         </tr>
+         <tr>
+          <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>
+         </tr>
+         <tr>
+           <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Vendor Number' | $T8 %]</td>
+           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
+           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
+           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
+           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+    <tr>
+     <td><hr size=3 noshade></td>
+    </tr>
+   </table>
+   <input type=hidden name=nextsub value=[% nextsub %]>
+   <br>
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
+  </form>
+ </body>
+ <script type="text/javascript">
+ <!--
+   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
+   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+   $(document).ready(function(){
+    focus();
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
+   })
+ //-->
+ </script>
+</html>
diff --git a/templates/webpages/ap/search_de.html b/templates/webpages/ap/search_de.html
deleted file mode 100644 (file)
index 37ca338..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right>Lieferant</th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Abteilung</th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Rechnungsnummer</th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Auftragsnummer</th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Bemerkungen</th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right">Projektnummer</th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Von</th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=?>
-      </td>
-     <th align=right>bis</th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=?>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap>In Bericht aufnehmen</th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Offen</td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Geschlossen</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungsnummer</td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsnummer</td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Auftragsnummer</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Lieferant</td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsdatum</td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuer</td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Summe</td>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungsdatum</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>bezahlt</td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Fälligkeitsdatum</td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag fällig</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bemerkungen</td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bearbeiter</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zwischensumme</td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Projektnummer</td>
-         </tr>
-         <tr>
-          <td colspan=4 align=left><b>Lieferant </td>
-         </tr>
-         <tr>
-           <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Lieferantennummer</td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Land</td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungskonditionen</td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="Weiter">
-  </form>
- </body>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','Falsches Format');
-   })
- //-->
- </script>
-</html>
diff --git a/templates/webpages/ap/search_en.html b/templates/webpages/ap/search_en.html
deleted file mode 100644 (file)
index b4ec8bf..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right>Vendor</th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Department</th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Invoice Number</th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Order Number</th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Notes</th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right">Project Number</th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>From</th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=button>
-      </td>
-     <th align=right>Bis</th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=button>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap>Include in Report</th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Open</td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Closed</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>ID</td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Invoice Number</td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Order Number</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Vendor</td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Invoice Date</td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Amount</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Tax</td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Total</td>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Date Paid</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Paid</td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Due Date</td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Amount Due</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Notes</td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Employee</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Subtotal</td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Project Number</td>
-         </tr>
-         <tr>
-          <td colspan=4 align=left><b>Vendor </td>
-         </tr>
-         <tr>
-           <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Vendor Number</td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Country</td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Payment Terms</td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="Continue">
-  </form>
- </body>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','wrongformat');
-   })
- //-->
- </script>
-</html>
diff --git a/templates/webpages/ap/search_master.html b/templates/webpages/ap/search_master.html
deleted file mode 100644 (file)
index 90d7667..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right><translate>Vendor</translate></th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Department</translate></th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Invoice Number</translate></th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Order Number</translate></th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Notes</translate></th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right"><translate>Project Number</translate></th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>From</translate></th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=<translate>button</translate>>
-      </td>
-     <th align=right><translate>Bis</translate></th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=<translate>button</translate>>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap><translate>Include in Report</translate></th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Open</translate></td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Closed</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>ID</translate></td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Number</translate></td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Order Number</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Vendor</translate></td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Date</translate></td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Tax</translate></td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Total</translate></td>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Date Paid</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Paid</translate></td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Due Date</translate></td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount Due</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Notes</translate></td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Employee</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Subtotal</translate></td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Project Number</translate></td>
-         </tr>
-         <tr>
-          <td colspan=4 align=left><b><translate>Vendor</translate> </td>
-         </tr>
-         <tr>
-           <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Vendor Number</translate></td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Country</translate></td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>USt-IdNr.</translate></td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Steuersatz</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Payment Terms</translate></td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Buchungskonto</translate></td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="<translate>Continue</translate>">
-  </form>
- </body>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    focus();
-    setupDateFormat('[% dateformat | html %]','<translate>Falsches Datumsformat!</translate>');
-    setupPoints('[% numberformat | html %]','<translate>wrongformat</translate>');
-   })
- //-->
- </script>
-</html>
diff --git a/templates/webpages/ar/ar_transactions_bottom.html b/templates/webpages/ar/ar_transactions_bottom.html
new file mode 100644 (file)
index 0000000..57bacca
--- /dev/null
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML %] <form method="post" action="ar.pl">
+
+  <input name="callback" type="hidden" value="[% callback %]">
+
+  [% 'Create new' | $T8 %]<br>
+
+  <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ar/ar_transactions_bottom_de.html b/templates/webpages/ar/ar_transactions_bottom_de.html
deleted file mode 100644 (file)
index b70f89d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ar.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  Neu erfassen<br>
-
-  <input class="submit" type="submit" name="action" value="Debitorenbuchung">
-  <input class="submit" type="submit" name="action" value="Rechnung">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ar/ar_transactions_bottom_en.html b/templates/webpages/ar/ar_transactions_bottom_en.html
deleted file mode 100644 (file)
index a32189d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ar.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  Create new<br>
-
-  <input class="submit" type="submit" name="action" value="Sales Transaction">
-  <input class="submit" type="submit" name="action" value="Sales Invoice">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ar/ar_transactions_bottom_master.html b/templates/webpages/ar/ar_transactions_bottom_master.html
deleted file mode 100644 (file)
index a6ffc7b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %] <form method="post" action="ar.pl">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  <translate>Create new</translate><br>
-
-  <input class="submit" type="submit" name="action" value="<translate>AR Transaction</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Sales Invoice</translate>">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
new file mode 100644 (file)
index 0000000..cf8c70a
--- /dev/null
@@ -0,0 +1,204 @@
+[%- USE T8 %]
+<body>
+
+ <form method=post name="search" action=[% script %]>
+
+  <table width=100%>
+  <tr><th class=listtop>[% title %]</th></tr>
+  <tr height="5"></tr>
+  <tr>
+   <td>
+    <table>
+     <tr>
+      <th align=right>[% 'Customer' | $T8 %]</th>
+      <td colspan=3>
+            [%- 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,
+                 -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
+      <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'department',
+                 style         = 'width: 250px',
+                 DATA          = ALL_DEPARTMENTS,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1,
+                 allow_textbox = 0,
+            -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
+      <td colspan=3><input name=invnumber size=20></td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
+      <td colspan=3><input name=ordnumber size=20></td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Transaction description' | $T8 %]</th>
+      <td colspan=3><input name=transaction_description size=40></td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
+      <td colspan=3><input name=notes size=40></td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
+      <td colspan="3">
+            [%- 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,
+            -%]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
+      <td>
+       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
+      </td>
+     <th align=right>[% 'Bis' | $T8 %]</th>
+     <td>
+      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
+     </td>
+    </tr>
+   <input type=hidden name=sort value=transdate>
+   </table>
+    </td>
+    </tr>
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
+        <td>
+         <table width=100%>
+          <tr>
+           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
+           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
+           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
+           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
+           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Customer' | $T8 %]</td>
+           <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
+           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
+           <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
+           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
+           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
+           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
+           <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Salesperson' | $T8 %]</td>
+           <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Shipping Point' | $T8 %]</td>
+           <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Ship via' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
+           <td nowrap> [% 'Ertrag' | $T8 %]</td>
+           <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
+           <td nowrap> [% 'Ertrag prozentual' | $T8 %]</td>
+           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
+           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
+           <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Transaction description' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Customer Number' | $T8 %]</td>
+           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
+           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
+           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
+           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+    <tr>
+     <td><hr size=3 noshade></td>
+    </tr>
+   </table>
+   <input type=hidden name=nextsub value=[% nextsub %]>
+   <br>
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
+  </form>
+ <script type="text/javascript">
+ <!--
+   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
+   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+   $(document).ready(function(){
+    $('customer').focus();
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
+   })
+ //-->
+ </script>
+ </body>
+</html>
diff --git a/templates/webpages/ar/search_de.html b/templates/webpages/ar/search_de.html
deleted file mode 100644 (file)
index b90aa3b..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right>Kunde</th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Abteilung</th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Rechnungsnummer</th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Auftragsnummer</th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Vorgangsbezeichnung</th>
-      <td colspan=3><input name=transaction_description size=40></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Bemerkungen</th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right">Projektnummer</th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Von</th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-       <input type=button name=transdatefrom id="trigger1" value=?>
-      </td>
-     <th align=right>bis</th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=?>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap>In Bericht aufnehmen</th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Offen</td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Geschlossen</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungsnummer</td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsnummer</td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Auftragsnummer</td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsdatum</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Kunde</td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Betrag</td>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuer</td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Summe</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungsdatum</td>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>bezahlt</td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Fälligkeitsdatum</td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag fällig</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bemerkungen</td>
-           <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Verkäufer</td>
-           <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Versandort</td>
-           <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Transportmittel</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag</td>
-           <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag prozentual</td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bearbeiter</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zwischensumme</td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Projektnummer</td>
-           <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Vorgangsbezeichnung</td>
-          </tr>
-          <tr>
-           <td colspan=4 align=left><b>Kunde </td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Kundennummer</td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Land</td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungskonditionen</td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="Weiter">
-  </form>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    $('customer').focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','Falsches Format');
-   })
- //-->
- </script>
- </body>
-</html>
diff --git a/templates/webpages/ar/search_en.html b/templates/webpages/ar/search_en.html
deleted file mode 100644 (file)
index 036b7d5..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right>Customer</th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Department</th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Invoice Number</th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Order Number</th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Transaction description</th>
-      <td colspan=3><input name=transaction_description size=40></td>
-     </tr>
-     <tr>
-      <th align=right nowrap>Notes</th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right">Project Number</th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap>From</th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-       <input type=button name=transdatefrom id="trigger1" value=button>
-      </td>
-     <th align=right>Bis</th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=button>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap>Include in Report</th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Open</td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Closed</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>ID</td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Invoice Number</td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Order Number</td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Invoice Date</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Customer</td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Amount</td>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Tax</td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Total</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Date Paid</td>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Paid</td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Due Date</td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Amount Due</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Notes</td>
-           <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Salesperson</td>
-           <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Shipping Point</td>
-           <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Ship via</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag</td>
-           <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag prozentual</td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Employee</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Subtotal</td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Project Number</td>
-           <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Transaction description</td>
-          </tr>
-          <tr>
-           <td colspan=4 align=left><b>Customer </td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Customer Number</td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Country</td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Payment Terms</td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="Continue">
-  </form>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    $('customer').focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','wrongformat');
-   })
- //-->
- </script>
- </body>
-</html>
diff --git a/templates/webpages/ar/search_master.html b/templates/webpages/ar/search_master.html
deleted file mode 100644 (file)
index 7b13425..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-<body>
-
- <form method=post name="search" action=[% script %]>
-
-  <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr>
-   <td>
-    <table>
-     <tr>
-      <th align=right><translate>Customer</translate></th>
-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Department</translate></th>
-      <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'department',
-                 style         = 'width: 250px',
-                 DATA          = ALL_DEPARTMENTS,
-                 id_key        = 'id',
-                 label_key     = 'description',
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Invoice Number</translate></th>
-      <td colspan=3><input name=invnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Order Number</translate></th>
-      <td colspan=3><input name=ordnumber size=20></td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Transaction description</translate></th>
-      <td colspan=3><input name=transaction_description size=40></td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>Notes</translate></th>
-      <td colspan=3><input name=notes size=40></td>
-     </tr>
-     <tr>
-      <th align="right"><translate>Project Number</translate></th>
-      <td colspan="3">
-            [%- 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,
-            -%]
-      </td>
-     </tr>
-     <tr>
-      <th align=right nowrap><translate>From</translate></th>
-      <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-       <input type=button name=transdatefrom id="trigger1" value=<translate>button</translate>>
-      </td>
-     <th align=right><translate>Bis</translate></th>
-     <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=<translate>button</translate>>
-     </td>
-    </tr>
-   <input type=hidden name=sort value=transdate>
-   </table>
-    </td>
-    </tr>
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align=right nowrap><translate>Include in Report</translate></th>
-        <td>
-         <table width=100%>
-          <tr>
-           <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Open</translate></td>
-           <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Closed</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>ID</translate></td>
-           <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Number</translate></td>
-           <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Order Number</translate></td>
-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Date</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Customer</translate></td>
-           <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap><translate>Amount</translate></td>
-           <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Tax</translate></td>
-           <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap><translate>Total</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Date Paid</translate></td>
-           <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Paid</translate></td>
-           <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Due Date</translate></td>
-           <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount Due</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Notes</translate></td>
-           <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Salesperson</translate></td>
-           <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Shipping Point</translate></td>
-           <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Ship via</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> <translate>Ertrag</translate></td>
-           <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> <translate>Ertrag prozentual</translate></td>
-           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Employee</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Subtotal</translate></td>
-           <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Project Number</translate></td>
-           <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Transaction description</translate></td>
-          </tr>
-          <tr>
-           <td colspan=4 align=left><b><translate>Customer</translate> </td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Customer Number</translate></td>
-           <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Country</translate></td>
-           <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>USt-IdNr.</translate></td>
-           <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Steuersatz</translate></td>
-          </tr>
-          <tr>
-           <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Payment Terms</translate></td>
-           <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Buchungskonto</translate></td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
-   </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="<translate>Continue</translate>">
-  </form>
- <script type="text/javascript">
- <!--
-   Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-   Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-   $(document).ready(function(){
-    $('customer').focus();
-    setupDateFormat('[% dateformat | html %]','<translate>Falsches Datumsformat!</translate>');
-    setupPoints('[% numberformat | html %]','<translate>wrongformat</translate>');
-   })
- //-->
- </script>
- </body>
-</html>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
new file mode 100644 (file)
index 0000000..5ea2007
--- /dev/null
@@ -0,0 +1,71 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+[%- IF params.error %]
+ <p><div class="error_message">[% params.error %]</div></p>
+[%- END %]
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form method="post" action="bankaccounts.pl">
+
+  <p>
+   <table>
+    <tr>
+     <td align="right">[% 'Account number' | $T8 %]</td>
+     <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Bank code' | $T8 %]</td>
+     <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Bank' | $T8 %]</td>
+     <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'IBAN' | $T8 %]</td>
+     <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'BIC' | $T8 %]</td>
+     <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Chart' | $T8 %]</td>
+     <td>
+      [%- INCLUDE generic/multibox.html
+            name      = 'account.chart_id',
+            DATA      = CHARTS,
+            id_key    = 'id',
+            label_sub = 'chart_label',
+            style     = 'width: 300px',
+      -%]
+     </td>
+    </tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="hidden" name="action" value="dispatcher">
+   <input type="hidden" name="account.id" value="[% HTML.escape(account.id) %]">
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+[%- IF account.id %]
+   <input type="submit" name="action_bank_account_save" value="[% 'Save' | $T8 %]">
+   <input type="submit" name="action_bank_account_delete" value="[% 'Delete' | $T8 %]">
+[%- ELSE %]
+   <input type="submit" name="action_bank_account_save" value="[% 'Add' | $T8 %]">
+[%- END %]
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form_de.html b/templates/webpages/bankaccounts/bank_account_display_form_de.html
deleted file mode 100644 (file)
index 89faee1..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-<body>
-
-[%- IF params.error %]
- <p><div class="error_message">[% params.error %]</div></p>
-[%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="bankaccounts.pl">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Kontonummer</td>
-     <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Bankleitzahl</td>
-     <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Bank</td>
-     <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">IBAN</td>
-     <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">BIC</td>
-     <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Buchungskonto</td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'account.chart_id',
-            DATA      = CHARTS,
-            id_key    = 'id',
-            label_sub = 'chart_label',
-            style     = 'width: 300px',
-      -%]
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="account.id" value="[% HTML.escape(account.id) %]">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-[%- IF account.id %]
-   <input type="submit" name="action_bank_account_save" value="Speichern">
-   <input type="submit" name="action_bank_account_delete" value="Löschen">
-[%- ELSE %]
-   <input type="submit" name="action_bank_account_save" value="Erfassen">
-[%- END %]
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form_en.html b/templates/webpages/bankaccounts/bank_account_display_form_en.html
deleted file mode 100644 (file)
index e6bdd65..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-<body>
-
-[%- IF params.error %]
- <p><div class="error_message">[% params.error %]</div></p>
-[%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="bankaccounts.pl">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Account number</td>
-     <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Bank code</td>
-     <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Bank</td>
-     <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">IBAN</td>
-     <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">BIC</td>
-     <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Chart</td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'account.chart_id',
-            DATA      = CHARTS,
-            id_key    = 'id',
-            label_sub = 'chart_label',
-            style     = 'width: 300px',
-      -%]
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="account.id" value="[% HTML.escape(account.id) %]">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-[%- IF account.id %]
-   <input type="submit" name="action_bank_account_save" value="Save">
-   <input type="submit" name="action_bank_account_delete" value="Delete">
-[%- ELSE %]
-   <input type="submit" name="action_bank_account_save" value="Add">
-[%- END %]
-  </p>
- </form>
-
-</body>
-</html>
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 (file)
index 05b08a6..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[% USE HTML %]
-<body>
-
-[%- IF params.error %]
- <p><div class="error_message">[% params.error %]</div></p>
-[%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="bankaccounts.pl">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right"><translate>Account number</translate></td>
-     <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Bank code</translate></td>
-     <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Bank</translate></td>
-     <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>IBAN</translate></td>
-     <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>BIC</translate></td>
-     <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Chart</translate></td>
-     <td>
-      [%- INCLUDE generic/multibox.html
-            name      = 'account.chart_id',
-            DATA      = CHARTS,
-            id_key    = 'id',
-            label_sub = 'chart_label',
-            style     = 'width: 300px',
-      -%]
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="hidden" name="account.id" value="[% HTML.escape(account.id) %]">
-   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-[%- IF account.id %]
-   <input type="submit" name="action_bank_account_save" value="<translate>Save</translate>">
-   <input type="submit" name="action_bank_account_delete" value="<translate>Delete</translate>">
-[%- ELSE %]
-   <input type="submit" name="action_bank_account_save" value="<translate>Add</translate>">
-[%- END %]
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom.html b/templates/webpages/bankaccounts/bank_account_list_bottom.html
new file mode 100644 (file)
index 0000000..eeab8cc
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
+ <form action="bankaccounts.pl" method="post">
+  <p>
+   [% 'New bank account' | $T8 %]<br>
+   <input type="submit" value="[% 'Add' | $T8 %]">
+  </p>
+
+  <input type="hidden" name="action" value="bank_account_add">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+ </form>
+
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom_de.html b/templates/webpages/bankaccounts/bank_account_list_bottom_de.html
deleted file mode 100644 (file)
index 152f1b6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- <form action="bankaccounts.pl" method="post">
-  <p>
-   Neues Bankkonto<br>
-   <input type="submit" value="Erfassen">
-  </p>
-
-  <input type="hidden" name="action" value="bank_account_add">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- </form>
-
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom_en.html b/templates/webpages/bankaccounts/bank_account_list_bottom_en.html
deleted file mode 100644 (file)
index 1fef28b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- <form action="bankaccounts.pl" method="post">
-  <p>
-   New bank account<br>
-   <input type="submit" value="Add">
-  </p>
-
-  <input type="hidden" name="action" value="bank_account_add">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- </form>
-
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 (file)
index 1e69cd4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- <form action="bankaccounts.pl" method="post">
-  <p>
-   <translate>New bank account</translate><br>
-   <input type="submit" value="<translate>Add</translate>">
-  </p>
-
-  <input type="hidden" name="action" value="bank_account_add">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- </form>
-
diff --git a/templates/webpages/common/search_history.html b/templates/webpages/common/search_history.html
new file mode 100644 (file)
index 0000000..0b28469
--- /dev/null
@@ -0,0 +1,185 @@
+[%- USE T8 %]
+[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
+<script type="text/javascript" src="js/jscalendar/calendar.js"></script>
+<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
+<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
+
+<form method="post" action="am.pl">
+
+<input type="hidden" name="action" value="show_am_history">
+
+  <table>
+    <tr>
+      <th class ="listtop">[% 'history search engine' | $T8 %]</th>
+      </th>
+    </tr>
+    <tr>
+      <td>
+        <script type="text/javascript">
+          <!--
+                    function uncheckOther(id) {
+            if(!(
+                (document.getElementById('non-deleted').checked == false)
+                &&
+                (document.getElementById('both').checked == false)
+                &&
+                (document.getElementById('deleted').checked == false)
+              )) {
+                if(id == "deleted") {
+                  document.getElementById('non-deleted').checked = false;
+                  document.getElementById('both').checked = false;
+                }
+                if(id == "non-deleted") {
+                  document.getElementById('deleted').checked = false;
+                  document.getElementById('both').checked = false;
+                }
+                if(id == "both") {
+                  document.getElementById('non-deleted').checked = false;
+                  document.getElementById('deleted').checked = false;
+                }
+            }
+          }
+
+          var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
+          var translated = new Object();
+          translated['SAVED'] = '[% 'SAVED' | $T8 %]';
+          translated['DELETED'] = '[% 'DELETED' | $T8 %]';
+          translated['ADDED'] = '[% 'ADDED' | $T8 %]';
+          translated['PAYMENT POSTED'] = '[% 'PAYMENT POSTED' | $T8 %]';
+          translated['POSTED'] = '[% 'POSTED' | $T8 %]';
+          translated['POSTED AS NEW'] = '[% 'POSTED AS NEW' | $T8 %]'
+          translated['SAVED FOR DUNNING'] = '[% 'SAVED FOR DUNNING' | $T8 %]';
+          translated['DUNNING STARTED'] = '[% 'DUNNING STARTED' | $T8 %]';
+          translated['PRINTED'] = '[% 'PRINTED' | $T8 %]';
+
+          var jscalender = "<table valign=\"top\">"
+                  + "<tr><td colspan=\"2\"><b>[% 'Period' | $T8 %]:&nbsp;</b></td></tr>"
+                  + "<tr><td>[% 'from (time)' | $T8 %]:&nbsp;"
+                  + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
+                  + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
+                  + "&nbsp;</td><td>[% 'to (time)' | $T8 %]:&nbsp;"
+                  + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
+                  + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
+          var mitarbeiter = "<table valign=\"top\">"
+                  + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
+                  + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"
+                  + "</tr></table>";
+
+          var tempString = "";
+          function addForm(last, remove) {
+            if(last == "INIT") {
+              tempString = "<select id='selectForm'><option></option>";
+              for(i=0;i<defaults.length;i++) {
+                tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
+              }
+              tempString += "</select>";
+              document.getElementById('selectEmployee').innerHTML = mitarbeiter;
+              document.getElementById('selectDate').innerHTML = jscalender;
+              document.getElementById('selectTable').innerHTML = tempString;
+
+              Calendar.setup(
+                    {
+                          inputField : "fromdate",
+                          ifFormat :"%d.%m.%Y",
+                          align : "BL",
+                          button : "trigger1"
+                      });
+
+                    Calendar.setup(
+                    {
+                          inputField : "todate",
+                          ifFormat :"%d.%m.%Y",
+                          align : "BL",
+                          button : "trigger2"
+                    });
+            }
+            else {
+              defaults.splice(remove,1);
+              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>[%- 'You\'ve already chosen the following limitations:' | $T8 %]</b><br>") : ("<br>")) + translated[last];
+              if(defaults.length > 0) {
+                document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
+                tempString = "<select id='selectForm'><option></option>";
+                for(i=0;i<defaults.length;i++) {
+                  tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
+                }
+                tempString += "</select>";
+                document.getElementById('selectTable').innerHTML = tempString;
+              }
+              else {
+                document.getElementById('selectTable').innerHTML = "";
+              }
+            }
+          }
+
+          function resetAll() {
+            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">[% 'Yes' | $T8 %]";
+            document.getElementById('inputText').innerHTML = "";
+          }
+          //-->
+        </script>
+        <table>
+          <tr>
+            <td>
+              [% '<b>What</b> do you want to look for?' | $T8 %]:
+            </td>
+            <td>
+              <select name="what2search" id="what2search">
+                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">[% 'Part Number' | $T8 %]</option>
+                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">[% 'Customer Number' | $T8 %]</option>
+                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">[% 'Vendor Number' | $T8 %]</option>
+                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">[% 'Project Number' | $T8 %]</option>
+                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
+                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">[% 'Incoming invoice number' | $T8 %]</option>
+                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">[% 'Sales invoice number' | $T8 %]</option>
+                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">[% 'Dunning number' | $T8 %]</option>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td>
+             [% 'What's the <b>term</b> you're looking for?' | $T8 %]
+            </td>
+            <td>
+              <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
+            </td>
+          </tr>
+          <tr>
+            <td valign="top">
+             [% 'Do you want to <b>limit</b> your search?' | $T8 %]
+            </td>
+            <td>
+              <table valign="top" cellpadding="0" marginheight="0" marginwidth="0" cellspacing="0" topmargin="0" leftmargin="0">
+                <tr>
+                  <td>
+                    <div id="selectTable"><a href="javascript:addForm('INIT')">[% 'Yes' | $T8 %]</a></div>
+                    <div id="inputText"></div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <div id="selectEmployee"></div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <div id="selectDate"></div>
+                  </td>
+                </tr>
+              </table>
+              <input type="hidden" name="einschraenkungen" id="einschraenkungen" value="">
+            </td>
+          </tr>
+          </tr>
+          <tr>
+            <td colspan="6">
+              <input type="submit" class="submit" value="[% 'submit' | $T8 %]">
+              <input type="reset" class="submit" value="[% 'reset' | $T8 %]" onClick="javascript:resetAll();">
+            </td>
+            <td>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</form>
diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
deleted file mode 100644 (file)
index 5b98d95..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
-<script type="text/javascript" src="js/jscalendar/calendar.js"></script>
-<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
-<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
-
-<form method="post" action="am.pl">
-
-<input type="hidden" name="action" value="show_am_history">
-
-  <table>
-    <tr>
-      <th class ="listtop">Historien Suchmaschine</th>
-      </th>
-    </tr>
-    <tr>
-      <td>
-        <script type="text/javascript">
-          <!--
-                    function uncheckOther(id) {
-            if(!(
-                (document.getElementById('non-deleted').checked == false)
-                &&
-                (document.getElementById('both').checked == false)
-                &&
-                (document.getElementById('deleted').checked == false)
-              )) {
-                if(id == "deleted") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "non-deleted") {
-                  document.getElementById('deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "both") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('deleted').checked = false;
-                }
-            }
-          }
-
-          var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
-          var translated = new Object();
-          translated['SAVED'] = 'Gespeichert';
-          translated['DELETED'] = 'Gelöscht';
-          translated['ADDED'] = 'Hinzugefügt';
-          translated['PAYMENT POSTED'] = 'Rechung gebucht';
-          translated['POSTED'] = 'Gebucht';
-          translated['POSTED AS NEW'] = 'Als neu gebucht'
-          translated['SAVED FOR DUNNING'] = 'Gespeichert';
-          translated['DUNNING STARTED'] = 'Mahnprozess gestartet';
-          translated['PRINTED'] = 'Gedruckt';
-
-          var jscalender = "<table valign=\"top\">"
-                  + "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
-                  + "<tr><td>von:&nbsp;"
-                  + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
-                  + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
-                  + "&nbsp;</td><td>bis:&nbsp;"
-                  + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
-                  + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
-          var mitarbeiter = "<table valign=\"top\">"
-                  + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
-                  + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"
-                  + "</tr></table>";
-
-          var tempString = "";
-          function addForm(last, remove) {
-            if(last == "INIT") {
-              tempString = "<select id='selectForm'><option></option>";
-              for(i=0;i<defaults.length;i++) {
-                tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-              }
-              tempString += "</select>";
-              document.getElementById('selectEmployee').innerHTML = mitarbeiter;
-              document.getElementById('selectDate').innerHTML = jscalender;
-              document.getElementById('selectTable').innerHTML = tempString;
-
-              Calendar.setup(
-                    {
-                          inputField : "fromdate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger1"
-                      });
-
-                    Calendar.setup(
-                    {
-                          inputField : "todate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger2"
-                    });
-            }
-            else {
-              defaults.splice(remove,1);
-              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>Sie haben bereits die folgenden Einschr&auml;nkungen vorgenommen:</b><br>") : ("<br>")) + translated[last];
-              if(defaults.length > 0) {
-                document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
-                tempString = "<select id='selectForm'><option></option>";
-                for(i=0;i<defaults.length;i++) {
-                  tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-                }
-                tempString += "</select>";
-                document.getElementById('selectTable').innerHTML = tempString;
-              }
-              else {
-                document.getElementById('selectTable').innerHTML = "";
-              }
-            }
-          }
-
-          function resetAll() {
-            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">Ja";
-            document.getElementById('inputText').innerHTML = "";
-          }
-          //-->
-        </script>
-        <table>
-          <tr>
-            <td>
-              <b>Wonach</b> wollen Sie suchen?:
-            </td>
-            <td>
-              <select name="what2search" id="what2search">
-                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">Artikelnummer</option>
-                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">Kundennummer</option>
-                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">Lieferantennummer</option>
-                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">Projektnummer</option>
-                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">Buchungsnummer</option>
-                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">Eingangsrechnungsnummer</option>
-                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">Ausgangsrechnungsnummer</option>
-                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">Mahnungsnummer</option>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td>
-             Nach welchem <b>Begriff</b> wollen Sie suchen?
-            </td>
-            <td>
-              <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
-            </td>
-          </tr>
-          <tr>
-            <td valign="top">
-             Wollen Sie Ihre Suche <b>spezialisieren</b>?
-            </td>
-            <td>
-              <table valign=\"top\" cellpadding=\"0\" marginheight=\"0\" marginwidth=\"0\" cellspacing=\"0\" topmargin=\"0\" leftmargin=\"0\">
-                <tr>
-                  <td>
-                    <div id="selectTable"><a href="javascript:addForm('INIT')">Ja</a></div>
-                    <div id="inputText"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectEmployee"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectDate"></div>
-                  </td>
-                </tr>
-              </table>
-              <input type="hidden" name="einschraenkungen" id="einschraenkungen" value="">
-            </td>
-          </tr>
-          </tr>
-          <tr>
-            <td colspan="6">
-              <input type="submit" class="submit" value="abschicken">
-              <input type="reset" class="submit" value="zurücksetzen" onClick="javascript:resetAll();">
-            </td>
-            <td>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/templates/webpages/common/search_history_en.html b/templates/webpages/common/search_history_en.html
deleted file mode 100644 (file)
index 8cb75c3..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
-<script type="text/javascript" src="js/jscalendar/calendar.js"></script>
-<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
-<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
-
-<form method="post" action="am.pl">
-
-<input type="hidden" name="action" value="show_am_history">
-
-  <table>
-    <tr>
-      <th class ="listtop">history search engine</th>
-      </th>
-    </tr>
-    <tr>
-      <td>
-        <script type="text/javascript">
-          <!--
-                    function uncheckOther(id) {
-            if(!(
-                (document.getElementById('non-deleted').checked == false)
-                &&
-                (document.getElementById('both').checked == false)
-                &&
-                (document.getElementById('deleted').checked == false)
-              )) {
-                if(id == "deleted") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "non-deleted") {
-                  document.getElementById('deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "both") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('deleted').checked = false;
-                }
-            }
-          }
-
-          var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
-          var translated = new Object();
-          translated['SAVED'] = 'SAVED';
-          translated['DELETED'] = 'DELETED';
-          translated['ADDED'] = 'ADDED';
-          translated['PAYMENT POSTED'] = 'PAYMENT POSTED';
-          translated['POSTED'] = 'POSTED';
-          translated['POSTED AS NEW'] = 'POSTED AS NEW'
-          translated['SAVED FOR DUNNING'] = 'SAVED FOR DUNNING';
-          translated['DUNNING STARTED'] = 'DUNNING STARTED';
-          translated['PRINTED'] = 'PRINTED';
-
-          var jscalender = "<table valign=\"top\">"
-                  + "<tr><td colspan=\"2\"><b>Period:&nbsp;</b></td></tr>"
-                  + "<tr><td>from (time):&nbsp;"
-                  + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
-                  + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
-                  + "&nbsp;</td><td>to (time):&nbsp;"
-                  + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
-                  + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
-          var mitarbeiter = "<table valign=\"top\">"
-                  + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
-                  + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"
-                  + "</tr></table>";
-
-          var tempString = "";
-          function addForm(last, remove) {
-            if(last == "INIT") {
-              tempString = "<select id='selectForm'><option></option>";
-              for(i=0;i<defaults.length;i++) {
-                tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-              }
-              tempString += "</select>";
-              document.getElementById('selectEmployee').innerHTML = mitarbeiter;
-              document.getElementById('selectDate').innerHTML = jscalender;
-              document.getElementById('selectTable').innerHTML = tempString;
-
-              Calendar.setup(
-                    {
-                          inputField : "fromdate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger1"
-                      });
-
-                    Calendar.setup(
-                    {
-                          inputField : "todate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger2"
-                    });
-            }
-            else {
-              defaults.splice(remove,1);
-              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>You've already chosen the following limitations:</b><br>") : ("<br>")) + translated[last];
-              if(defaults.length > 0) {
-                document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
-                tempString = "<select id='selectForm'><option></option>";
-                for(i=0;i<defaults.length;i++) {
-                  tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-                }
-                tempString += "</select>";
-                document.getElementById('selectTable').innerHTML = tempString;
-              }
-              else {
-                document.getElementById('selectTable').innerHTML = "";
-              }
-            }
-          }
-
-          function resetAll() {
-            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">Yes";
-            document.getElementById('inputText').innerHTML = "";
-          }
-          //-->
-        </script>
-        <table>
-          <tr>
-            <td>
-              <b>What</b> do you want to look for?:
-            </td>
-            <td>
-              <select name="what2search" id="what2search">
-                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">Part Number</option>
-                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">Customer Number</option>
-                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">Vendor Number</option>
-                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">Project Number</option>
-                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">ID</option>
-                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">Incoming invoice number</option>
-                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">Sales invoice number</option>
-                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">Dunning number</option>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td>
-             What's the <b>term</b> you're looking for?
-            </td>
-            <td>
-              <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
-            </td>
-          </tr>
-          <tr>
-            <td valign="top">
-             Do you want to <b>limit</b> your search?
-            </td>
-            <td>
-              <table valign=\"top\" cellpadding=\"0\" marginheight=\"0\" marginwidth=\"0\" cellspacing=\"0\" topmargin=\"0\" leftmargin=\"0\">
-                <tr>
-                  <td>
-                    <div id="selectTable"><a href="javascript:addForm('INIT')">Yes</a></div>
-                    <div id="inputText"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectEmployee"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectDate"></div>
-                  </td>
-                </tr>
-              </table>
-              <input type="hidden" name="einschraenkungen" id="einschraenkungen" value="">
-            </td>
-          </tr>
-          </tr>
-          <tr>
-            <td colspan="6">
-              <input type="submit" class="submit" value="submit">
-              <input type="reset" class="submit" value="reset" onClick="javascript:resetAll();">
-            </td>
-            <td>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
deleted file mode 100644 (file)
index 1f8411f..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
-<script type="text/javascript" src="js/jscalendar/calendar.js"></script>
-<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
-<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
-
-<form method="post" action="am.pl">
-
-<input type="hidden" name="action" value="show_am_history">
-
-  <table>
-    <tr>
-      <th class ="listtop"><translate>history search engine</translate></th>
-      </th>
-    </tr>
-    <tr>
-      <td>
-        <script type="text/javascript">
-          <!--
-                    function uncheckOther(id) {
-            if(!(
-                (document.getElementById('non-deleted').checked == false)
-                &&
-                (document.getElementById('both').checked == false)
-                &&
-                (document.getElementById('deleted').checked == false)
-              )) {
-                if(id == "deleted") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "non-deleted") {
-                  document.getElementById('deleted').checked = false;
-                  document.getElementById('both').checked = false;
-                }
-                if(id == "both") {
-                  document.getElementById('non-deleted').checked = false;
-                  document.getElementById('deleted').checked = false;
-                }
-            }
-          }
-
-          var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
-          var translated = new Object();
-          translated['SAVED'] = '<translate>SAVED</translate>';
-          translated['DELETED'] = '<translate>DELETED</translate>';
-          translated['ADDED'] = '<translate>ADDED</translate>';
-          translated['PAYMENT POSTED'] = '<translate>PAYMENT POSTED</translate>';
-          translated['POSTED'] = '<translate>POSTED</translate>';
-          translated['POSTED AS NEW'] = '<translate>POSTED AS NEW</translate>'
-          translated['SAVED FOR DUNNING'] = '<translate>SAVED FOR DUNNING</translate>';
-          translated['DUNNING STARTED'] = '<translate>DUNNING STARTED</translate>';
-          translated['PRINTED'] = '<translate>PRINTED</translate>';
-
-          var jscalender = "<table valign=\"top\">"
-                  + "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
-                  + "<tr><td><translate>from (time)</translate>:&nbsp;"
-                  + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
-                  + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
-                  + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
-                  + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
-                  + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
-          var mitarbeiter = "<table valign=\"top\">"
-                  + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
-                  + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"
-                  + "</tr></table>";
-
-          var tempString = "";
-          function addForm(last, remove) {
-            if(last == "INIT") {
-              tempString = "<select id='selectForm'><option></option>";
-              for(i=0;i<defaults.length;i++) {
-                tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-              }
-              tempString += "</select>";
-              document.getElementById('selectEmployee').innerHTML = mitarbeiter;
-              document.getElementById('selectDate').innerHTML = jscalender;
-              document.getElementById('selectTable').innerHTML = tempString;
-
-              Calendar.setup(
-                    {
-                          inputField : "fromdate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger1"
-                      });
-
-                    Calendar.setup(
-                    {
-                          inputField : "todate",
-                          ifFormat :"%d.%m.%Y",
-                          align : "BL",
-                          button : "trigger2"
-                    });
-            }
-            else {
-              defaults.splice(remove,1);
-              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b><translate>You've already chosen the following limitations:</translate></b><br>") : ("<br>")) + translated[last];
-              if(defaults.length > 0) {
-                document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
-                tempString = "<select id='selectForm'><option></option>";
-                for(i=0;i<defaults.length;i++) {
-                  tempString += "\<option value\=\'" + defaults[i] + "\'\ onClick=\"javascript:addForm(\'" + defaults[i] + "\', " + i + ");\">" + translated[defaults[i]] + "\<\/option\>" + "\n";
-                }
-                tempString += "</select>";
-                document.getElementById('selectTable').innerHTML = tempString;
-              }
-              else {
-                document.getElementById('selectTable').innerHTML = "";
-              }
-            }
-          }
-
-          function resetAll() {
-            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\"><translate>Yes</translate>";
-            document.getElementById('inputText').innerHTML = "";
-          }
-          //-->
-        </script>
-        <table>
-          <tr>
-            <td>
-              <translate><b>What</b> do you want to look for?</translate>:
-            </td>
-            <td>
-              <select name="what2search" id="what2search">
-                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer"><translate>Part Number</translate></option>
-                <option name="Kundennummer" value="Kundennummer" id="Kundennummer"><translate>Customer Number</translate></option>
-                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer"><translate>Vendor Number</translate></option>
-                <option name="Projektnummer" value="Projektnummer" id="Projektnummer"><translate>Project Number</translate></option>
-                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer"><translate>ID</translate></option>
-                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer"><translate>Incoming invoice number</translate></option>
-                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer"><translate>Sales invoice number</translate></option>
-                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer"><translate>Dunning number</translate></option>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td>
-             <translate>What's the <b>term</b> you're looking for?</translate>
-            </td>
-            <td>
-              <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
-            </td>
-          </tr>
-          <tr>
-            <td valign="top">
-             <translate>Do you want to <b>limit</b> your search?</translate>
-            </td>
-            <td>
-              <table valign=\"top\" cellpadding=\"0\" marginheight=\"0\" marginwidth=\"0\" cellspacing=\"0\" topmargin=\"0\" leftmargin=\"0\">
-                <tr>
-                  <td>
-                    <div id="selectTable"><a href="javascript:addForm('INIT')"><translate>Yes</translate></a></div>
-                    <div id="inputText"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectEmployee"></div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div id="selectDate"></div>
-                  </td>
-                </tr>
-              </table>
-              <input type="hidden" name="einschraenkungen" id="einschraenkungen" value="">
-            </td>
-          </tr>
-          </tr>
-          <tr>
-            <td colspan="6">
-              <input type="submit" class="submit" value="<translate>submit</translate>">
-              <input type="reset" class="submit" value="<translate>reset</translate>" onClick="javascript:resetAll();">
-            </td>
-            <td>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/templates/webpages/common/show_history.html b/templates/webpages/common/show_history.html
new file mode 100644 (file)
index 0000000..1b9b7e1
--- /dev/null
@@ -0,0 +1,123 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% IF SUCCESS %]
+
+[% BLOCK column_header %]
+            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
+             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
+             [% ELSE %]
+               <tr><td><a href="[% callback %]&order=[% column %]--0" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&and;</a></td></tr>
+             [% END %]
+             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
+             [% ELSE %]
+               <tr><td><a href="[% callback %]&order=[% column %]--1" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&or;</a></td></tr>
+             [% END %]
+            </table>
+[% END %]
+
+<table>
+  <tr>
+    <th class="listtop">
+      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
+        <tr>
+          <td align="center" valign="middle">
+           &nbsp;[% 'Zeitpunkt' | $T8 %]&nbsp;
+          </td>
+          <td valign="top">
+           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
+          </td>
+        </tr>
+      </table>
+    </th>
+    <th class=listtop>
+      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
+        <tr>
+          <td align="center" valign="middle">
+            &nbsp;[% 'Mitarbeiter' | $T8 %]&nbsp;
+          </td>
+          <td valign="top">
+           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
+          </td>
+        </tr>
+      </table>
+    </th>
+    <th class=listtop>
+      <table>
+        <tr>
+          <td>
+            &nbsp;[% 'Aktion' | $T8 %]&nbsp;
+          </td>
+        </tr>
+      </table>
+    </th>
+    <th class=listtop>
+      <table>
+        <tr>
+          <td>
+            &nbsp;[% 'Zusatz' | $T8 %]&nbsp;
+          </td>
+        </tr>
+      </table>
+    </th>
+    <th class=listtop>
+      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
+        <tr>
+          <td align="center" valign="middle">
+           &nbsp;[% 'ID-Nummer' | $T8 %]&nbsp;
+          </td>
+          <td valign="top">
+            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
+          </td>
+        </tr>
+      </table>
+    </th>
+    <th class=listtop>
+      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
+        <tr>
+          <td align="center" valign="middle">
+           &nbsp;[% 'Belegnummer' | $T8 %]&nbsp;
+          </td>
+          <td valign="top">
+            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
+          </td>
+        </tr>
+      </table>
+    </th>
+  </tr>
+  <tbody>
+[% FOREACH row = DATEN %]
+  <tr class="listrow[% loop.count % 2 %]">
+    <td nowrap>
+      &nbsp;[% HTML.escape(row.itime) %]&nbsp;
+    </td>
+    <td nowrap>
+      &nbsp;[% HTML.escape(row.name) %]&nbsp;
+    </td>
+    <td>
+      &nbsp;[% HTML.escape(row.addition) %]&nbsp;
+    </td>
+    <td>
+      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
+    </td>
+    <td>
+      &nbsp;[% HTML.escape(row.id) %]&nbsp;
+    </td>
+    <td>
+      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
+    </td>
+  </tr>
+[% END %]
+</tbody>
+</table>
+[% ELSE %]
+<b>[% 'Keine Suchergebnisse gefunden!' | $T8 %]</b><br>
+[% END %]
+<p>
+[% IF NONEWWINDOW %]
+<input type="button" onclick="javascript:history.back(-1);" value="[% 'back' | $T8 %]">
+[% ELSE %]
+<input type="button" onclick="javascript:window.close();" value="[% 'close' | $T8 %]">
+[% END %]
+</p>
diff --git a/templates/webpages/common/show_history_de.html b/templates/webpages/common/show_history_de.html
deleted file mode 100644 (file)
index 1fb0f24..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-[% IF SUCCESS %]
-
-[% BLOCK column_header %]
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--0" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% END %]
-             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--1" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% END %]
-            </table>
-[% END %]
-
-<table>
-  <tr>
-    <th class="listtop">
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;Zeitpunkt&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-            &nbsp;Mitarbeiter&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;Aktion&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;Zusatz&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;ID-Nummer (intern)&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;Buchungsnummer&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-  </tr>
-  <tbody>
-[% FOREACH row = DATEN %]
-  <tr class="listrow[% loop.count % 2 %]">
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.itime) %]&nbsp;
-    </td>
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.name) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.addition) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.id) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
-    </td>
-  </tr>
-[% END %]
-</tbody>
-</table>
-[% ELSE %]
-<b>Keine Suchergebnisse gefunden!</b><br>
-[% END %]
-<p>
-[% IF NONEWWINDOW %]
-<input type="button" onclick="javascript:history.back(-1);" value="zurück">
-[% ELSE %]
-<input type="button" onclick="javascript:window.close();" value="schließen">
-[% END %]
-</p>
diff --git a/templates/webpages/common/show_history_en.html b/templates/webpages/common/show_history_en.html
deleted file mode 100644 (file)
index 2493eb0..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-[% IF SUCCESS %]
-
-[% BLOCK column_header %]
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               <tr><td><a title="order" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--0" title="order" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% END %]
-             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               <tr><td><a title="order" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--1" title="order" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% END %]
-            </table>
-[% END %]
-
-<table>
-  <tr>
-    <th class="listtop">
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;Zeitpunkt&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-            &nbsp;Mitarbeiter&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;Aktion&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;Zusatz&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;ID-Nummer&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;Belegnummer&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-  </tr>
-  <tbody>
-[% FOREACH row = DATEN %]
-  <tr class="listrow[% loop.count % 2 %]">
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.itime) %]&nbsp;
-    </td>
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.name) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.addition) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.id) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
-    </td>
-  </tr>
-[% END %]
-</tbody>
-</table>
-[% ELSE %]
-<b>Keine Suchergebnisse gefunden!</b><br>
-[% END %]
-<p>
-[% IF NONEWWINDOW %]
-<input type="button" onclick="javascript:history.back(-1);" value="back">
-[% ELSE %]
-<input type="button" onclick="javascript:window.close();" value="close">
-[% END %]
-</p>
diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
deleted file mode 100644 (file)
index 5847496..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-[% IF SUCCESS %]
-
-[% BLOCK column_header %]
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--0" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-             [% END %]
-             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--1" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-             [% END %]
-            </table>
-[% END %]
-
-<table>
-  <tr>
-    <th class="listtop">
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;<translate>Zeitpunkt</translate>&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-            &nbsp;<translate>Mitarbeiter</translate>&nbsp;
-          </td>
-          <td valign="top">
-           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;<translate>Aktion</translate>&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table>
-        <tr>
-          <td>
-            &nbsp;<translate>Zusatz</translate>&nbsp;
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;<translate>ID-Nummer</translate>&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-    <th class=listtop>
-      <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
-        <tr>
-          <td align="center" valign="middle">
-           &nbsp;<translate>Belegnummer</translate>&nbsp;
-          </td>
-          <td valign="top">
-            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
-          </td>
-        </tr>
-      </table>
-    </th>
-  </tr>
-  <tbody>
-[% FOREACH row = DATEN %]
-  <tr class="listrow[% loop.count % 2 %]">
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.itime) %]&nbsp;
-    </td>
-    <td nowrap>
-      &nbsp;[% HTML.escape(row.name) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.addition) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.id) %]&nbsp;
-    </td>
-    <td>
-      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
-    </td>
-  </tr>
-[% END %]
-</tbody>
-</table>
-[% ELSE %]
-<b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
-[% END %]
-<p>
-[% IF NONEWWINDOW %]
-<input type="button" onclick="javascript:history.back(-1);" value="<translate>back</translate>">
-[% ELSE %]
-<input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
-[% END %]
-</p>
diff --git a/templates/webpages/common/show_vc_details.html b/templates/webpages/common/show_vc_details.html
new file mode 100644 (file)
index 0000000..49363ea
--- /dev/null
@@ -0,0 +1,329 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+[% BLOCK jump_block %]
+ <p>
+  [% 'Jump to' | $T8 %] <a href="#billing">[% 'Billing Address' | $T8 %]</a>
+  [%- FOREACH shipto = SHIPTO %]
+   ,
+   <a href="#shipping[% loop.count %]">
+    [% 'Shipping Address' | $T8 %]
+    &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
+   </a>
+  [%- END %]
+  [%- FOREACH contact = CONTACTS %]
+   ,
+   <a href="#contact[% loop.count %]">
+    [% 'Contact Person' | $T8 %]
+    &quot;[% HTML.escape(contact.cp_name) %]&quot;
+   </a>
+  [%- END %]
+ </p>
+
+ <hr>
+[% END %]
+
+<body>
+
+ <div width="100%" class="listtop">
+  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] &quot;[% HTML.escape(name) %]&quot;
+ </div>
+
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+ <a name="billing"><div class="listheading">[% 'Billing Address' | $T8 %]</div></a>
+
+ <table>
+  <tr>
+  [% IF is_customer %]
+   <td align="right">[% 'Customer Number' | $T8 %]</td>
+   <td>[% HTML.escape(customernumber) %]</td>
+  [% ELSE %]
+   <td align="right">[% 'Vendor Number' | $T8 %]</td>
+   <td>[% HTML.escape(vendornumber) %]</td>
+  [% END %]
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Company Name' | $T8 %]</td>
+   <td>[% HTML.escape(name) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Department' | $T8 %]</td>
+   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Street' | $T8 %]</td>
+   <td>[% HTML.escape(street) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Zip, City' | $T8 %]</td>
+   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Country' | $T8 %]</td>
+   <td>[% HTML.escape(country) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Contact Person' | $T8 %]</td>
+   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Phone' | $T8 %]</td>
+   <td>[% HTML.escape(phone) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Fax' | $T8 %]</td>
+   <td>[% HTML.escape(fax) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'E-mail' | $T8 %]</td>
+   <td>[% HTML.escape(email) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Homepage' | $T8 %]</td>
+   <td>[% HTML.escape(homepage) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Credit Limit' | $T8 %]</td>
+   <td>[% HTML.escape(creditlimit) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Discount' | $T8 %]</td>
+   <td>[% HTML.escape(discount) %]%</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Payment Terms' | $T8 %]</td>
+   <td>[% HTML.escape(payment_terms) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Tax Number' | $T8 %]</td>
+   <td>[% HTML.escape(taxnumber) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'USt-IdNr.' | $T8 %]</td>
+   <td>[% HTML.escape(ustid) %]</td>
+  </tr>
+
+  [% IF is_customer %]
+   <tr>
+    <td align="right">[% 'KNr. beim Kunden' | $T8 %]</td>
+    <td>[% HTML.escape(c_vendor_id) %]</td>
+   </tr>
+  [% END %]
+
+  <tr>
+   <td align="right">[% 'Account Number' | $T8 %]</td>
+   <td>[% HTML.escape(account_number) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Bank Code' | $T8 %]</td>
+   <td>[% HTML.escape(bank_code) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Bank' | $T8 %]</td>
+   <td>[% HTML.escape(bank) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</td>
+   <td>[% HTML.escape(business) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right">[% 'Language' | $T8 %]</td>
+   <td>[% HTML.escape(language) %]</td>
+  </tr>
+
+  <tr>
+   <td align="right" valign="top">[% 'Notes' | $T8 %]</td>
+   <td valign="top">[% HTML.escape(notes) %]</td>
+  </tr>
+
+ </table>
+
+
+
+
+ [% FOREACH row = SHIPTO %]
+
+  <hr>
+
+  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+  <a name="shipping[% loop.count %]"><div class="listheading">[% 'Shipping Address' | $T8 %] &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
+
+  <table>
+   <tr>
+    <td align="right">[% 'Company Name' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptoname) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Department' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Street' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptostreet) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Zip, City' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Country' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptocountry) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Contact Person' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptocontact) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Phone' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptophone) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Fax' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptofax) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
+    <td>[% HTML.escape(row.shiptoemail) %]</td>
+   </tr>
+
+  </table>
+ [% END %]
+
+
+
+
+
+
+
+
+
+
+ [% FOREACH row = CONTACTS %]
+
+  <hr>
+
+  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+
+  <a name="contact[% loop.count %]"><div class="listheading">[% 'Contact Person' | $T8 %] &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
+
+  <table>
+   <tr>
+    <td align="right">[% 'Greeting' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_greeting) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Title' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_title) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Given Name' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_givenname) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Name' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_name) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Department' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_abteilung) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Phone1' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_phone1) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Phone2' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_phone2) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Fax' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_fax) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Mobile1' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_mobile1) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Mobile2' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_mobile2) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Sat. Phone' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_satphone) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Sat. Fax' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_satfax) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Project' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_project) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_email) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Private Phone' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_privatphone) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Private E-mail' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_privatemail) %]</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Birthday' | $T8 %]</td>
+    <td>[% HTML.escape(row.cp_birthday) %]</td>
+   </tr>
+
+  </table>
+
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/common/show_vc_details_de.html b/templates/webpages/common/show_vc_details_de.html
deleted file mode 100644 (file)
index df0dd98..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-[% USE HTML %]
-
-[% BLOCK jump_block %]
- <p>
-  Springe zu <a href="#billing">Rechnungsadresse</a>
-  [%- FOREACH shipto = SHIPTO %]
-   ,
-   <a href="#shipping[% loop.count %]">
-    Lieferadresse
-    &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
-   </a>
-  [%- END %]
-  [%- FOREACH contact = CONTACTS %]
-   ,
-   <a href="#contact[% loop.count %]">
-    Ansprechpartner
-    &quot;[% HTML.escape(contact.cp_name) %]&quot;
-   </a>
-  [%- END %]
- </p>
-
- <hr>
-[% END %]
-
-<body>
-
- <div width="100%" class="listtop">
-  [% IF is_customer %]Kundendetails[% ELSE %]Lieferantendetails[% END %] &quot;[% HTML.escape(name) %]&quot;
- </div>
-
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
- <a name="billing"><div class="listheading">Rechnungsadresse</div></a>
-
- <table>
-  <tr>
-  [% IF is_customer %]
-   <td align="right">Kundennummer</td>
-   <td>[% HTML.escape(customernumber) %]</td>
-  [% ELSE %]
-   <td align="right">Lieferantennummer</td>
-   <td>[% HTML.escape(vendornumber) %]</td>
-  [% END %]
-  </tr>
-
-  <tr>
-   <td align="right">Firmenname</td>
-   <td>[% HTML.escape(name) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Abteilung</td>
-   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Straße</td>
-   <td>[% HTML.escape(street) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">PLZ, Ort</td>
-   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Land</td>
-   <td>[% HTML.escape(country) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Ansprechpartner</td>
-   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Telefon</td>
-   <td>[% HTML.escape(phone) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Fax</td>
-   <td>[% HTML.escape(fax) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">eMail</td>
-   <td>[% HTML.escape(email) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Homepage</td>
-   <td>[% HTML.escape(homepage) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Kreditlimit</td>
-   <td>[% HTML.escape(creditlimit) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Rabatt</td>
-   <td>[% HTML.escape(discount) %]%</td>
-  </tr>
-
-  <tr>
-   <td align="right">Zahlungskonditionen</td>
-   <td>[% HTML.escape(payment_terms) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Steuernummer</td>
-   <td>[% HTML.escape(taxnumber) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">USt-IdNr.</td>
-   <td>[% HTML.escape(ustid) %]</td>
-  </tr>
-
-  [% IF is_customer %]
-   <tr>
-    <td align="right">KNr. beim Kunden</td>
-    <td>[% HTML.escape(c_vendor_id) %]</td>
-   </tr>
-  [% END %]
-
-  <tr>
-   <td align="right">Kontonummer</td>
-   <td>[% HTML.escape(account_number) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">BLZ</td>
-   <td>[% HTML.escape(bank_code) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Bank</td>
-   <td>[% HTML.escape(bank) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</td>
-   <td>[% HTML.escape(business) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Sprache</td>
-   <td>[% HTML.escape(language) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right" valign="top">Bemerkungen</td>
-   <td valign="top">[% HTML.escape(notes) %]</td>
-  </tr>
-
- </table>
-
-
-
-
- [% FOREACH row = SHIPTO %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="shipping[% loop.count %]"><div class="listheading">Lieferadresse &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right">Firmenname</td>
-    <td>[% HTML.escape(row.shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Abteilung</td>
-    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Straße</td>
-    <td>[% HTML.escape(row.shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">PLZ, Ort</td>
-    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Land</td>
-    <td>[% HTML.escape(row.shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Ansprechpartner</td>
-    <td>[% HTML.escape(row.shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Telefon</td>
-    <td>[% HTML.escape(row.shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Fax</td>
-    <td>[% HTML.escape(row.shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">eMail</td>
-    <td>[% HTML.escape(row.shiptoemail) %]</td>
-   </tr>
-
-  </table>
- [% END %]
-
-
-
-
-
-
-
-
-
-
- [% FOREACH row = CONTACTS %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="contact[% loop.count %]"><div class="listheading">Ansprechpartner &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right">Anrede</td>
-    <td>[% HTML.escape(row.cp_greeting) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Titel</td>
-    <td>[% HTML.escape(row.cp_title) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Vorname</td>
-    <td>[% HTML.escape(row.cp_givenname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Name</td>
-    <td>[% HTML.escape(row.cp_name) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Abteilung</td>
-    <td>[% HTML.escape(row.cp_abteilung) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Telefon 1 </td>
-    <td>[% HTML.escape(row.cp_phone1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Telefon 2</td>
-    <td>[% HTML.escape(row.cp_phone2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Fax</td>
-    <td>[% HTML.escape(row.cp_fax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Mobile 1</td>
-    <td>[% HTML.escape(row.cp_mobile1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Mobile 2</td>
-    <td>[% HTML.escape(row.cp_mobile2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Sat. Tel.</td>
-    <td>[% HTML.escape(row.cp_satphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Sat. Fax</td>
-    <td>[% HTML.escape(row.cp_satfax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Projekt</td>
-    <td>[% HTML.escape(row.cp_project) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">eMail</td>
-    <td>[% HTML.escape(row.cp_email) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Privates Tel.</td>
-    <td>[% HTML.escape(row.cp_privatphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Private eMail</td>
-    <td>[% HTML.escape(row.cp_privatemail) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Geburtstag</td>
-    <td>[% HTML.escape(row.cp_birthday) %]</td>
-   </tr>
-
-  </table>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/common/show_vc_details_en.html b/templates/webpages/common/show_vc_details_en.html
deleted file mode 100644 (file)
index e597223..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-[% USE HTML %]
-
-[% BLOCK jump_block %]
- <p>
-  Jump to <a href="#billing">Billing Address</a>
-  [%- FOREACH shipto = SHIPTO %]
-   ,
-   <a href="#shipping[% loop.count %]">
-    Shipping Address
-    &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
-   </a>
-  [%- END %]
-  [%- FOREACH contact = CONTACTS %]
-   ,
-   <a href="#contact[% loop.count %]">
-    Contact Person
-    &quot;[% HTML.escape(contact.cp_name) %]&quot;
-   </a>
-  [%- END %]
- </p>
-
- <hr>
-[% END %]
-
-<body>
-
- <div width="100%" class="listtop">
-  [% IF is_customer %]Customer details[% ELSE %]Vendor details[% END %] &quot;[% HTML.escape(name) %]&quot;
- </div>
-
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
- <a name="billing"><div class="listheading">Billing Address</div></a>
-
- <table>
-  <tr>
-  [% IF is_customer %]
-   <td align="right">Customer Number</td>
-   <td>[% HTML.escape(customernumber) %]</td>
-  [% ELSE %]
-   <td align="right">Vendor Number</td>
-   <td>[% HTML.escape(vendornumber) %]</td>
-  [% END %]
-  </tr>
-
-  <tr>
-   <td align="right">Company Name</td>
-   <td>[% HTML.escape(name) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Department</td>
-   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Street</td>
-   <td>[% HTML.escape(street) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Zip, City</td>
-   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Country</td>
-   <td>[% HTML.escape(country) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Contact Person</td>
-   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Phone</td>
-   <td>[% HTML.escape(phone) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Fax</td>
-   <td>[% HTML.escape(fax) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">E-mail</td>
-   <td>[% HTML.escape(email) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Homepage</td>
-   <td>[% HTML.escape(homepage) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Credit Limit</td>
-   <td>[% HTML.escape(creditlimit) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Discount</td>
-   <td>[% HTML.escape(discount) %]%</td>
-  </tr>
-
-  <tr>
-   <td align="right">Payment Terms</td>
-   <td>[% HTML.escape(payment_terms) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Tax Number</td>
-   <td>[% HTML.escape(taxnumber) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">USt-IdNr.</td>
-   <td>[% HTML.escape(ustid) %]</td>
-  </tr>
-
-  [% IF is_customer %]
-   <tr>
-    <td align="right">KNr. beim Kunden</td>
-    <td>[% HTML.escape(c_vendor_id) %]</td>
-   </tr>
-  [% END %]
-
-  <tr>
-   <td align="right">Account Number</td>
-   <td>[% HTML.escape(account_number) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Bank Code</td>
-   <td>[% HTML.escape(bank_code) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Bank</td>
-   <td>[% HTML.escape(bank) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">[% IF is_customer %]Customer type[% ELSE %]Vendor type[% END %]</td>
-   <td>[% HTML.escape(business) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">Language</td>
-   <td>[% HTML.escape(language) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right" valign="top">Notes</td>
-   <td valign="top">[% HTML.escape(notes) %]</td>
-  </tr>
-
- </table>
-
-
-
-
- [% FOREACH row = SHIPTO %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="shipping[% loop.count %]"><div class="listheading">Shipping Address &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right">Company Name</td>
-    <td>[% HTML.escape(row.shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Department</td>
-    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Street</td>
-    <td>[% HTML.escape(row.shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Zip, City</td>
-    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Country</td>
-    <td>[% HTML.escape(row.shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Contact Person</td>
-    <td>[% HTML.escape(row.shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Phone</td>
-    <td>[% HTML.escape(row.shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Fax</td>
-    <td>[% HTML.escape(row.shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">E-mail</td>
-    <td>[% HTML.escape(row.shiptoemail) %]</td>
-   </tr>
-
-  </table>
- [% END %]
-
-
-
-
-
-
-
-
-
-
- [% FOREACH row = CONTACTS %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="contact[% loop.count %]"><div class="listheading">Contact Person &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right">Greeting</td>
-    <td>[% HTML.escape(row.cp_greeting) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Title</td>
-    <td>[% HTML.escape(row.cp_title) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Given Name</td>
-    <td>[% HTML.escape(row.cp_givenname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Name</td>
-    <td>[% HTML.escape(row.cp_name) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Department</td>
-    <td>[% HTML.escape(row.cp_abteilung) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Phone1</td>
-    <td>[% HTML.escape(row.cp_phone1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Phone2</td>
-    <td>[% HTML.escape(row.cp_phone2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Fax</td>
-    <td>[% HTML.escape(row.cp_fax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Mobile1</td>
-    <td>[% HTML.escape(row.cp_mobile1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Mobile2</td>
-    <td>[% HTML.escape(row.cp_mobile2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Sat. Phone</td>
-    <td>[% HTML.escape(row.cp_satphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Sat. Fax</td>
-    <td>[% HTML.escape(row.cp_satfax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Project</td>
-    <td>[% HTML.escape(row.cp_project) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">E-mail</td>
-    <td>[% HTML.escape(row.cp_email) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Private Phone</td>
-    <td>[% HTML.escape(row.cp_privatphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Private E-mail</td>
-    <td>[% HTML.escape(row.cp_privatemail) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right">Birthday</td>
-    <td>[% HTML.escape(row.cp_birthday) %]</td>
-   </tr>
-
-  </table>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/common/show_vc_details_master.html b/templates/webpages/common/show_vc_details_master.html
deleted file mode 100644 (file)
index 54b00b4..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-[% USE HTML %]
-
-[% BLOCK jump_block %]
- <p>
-  <translate>Jump to</translate> <a href="#billing"><translate>Billing Address</translate></a>
-  [%- FOREACH shipto = SHIPTO %]
-   ,
-   <a href="#shipping[% loop.count %]">
-    <translate>Shipping Address</translate>
-    &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
-   </a>
-  [%- END %]
-  [%- FOREACH contact = CONTACTS %]
-   ,
-   <a href="#contact[% loop.count %]">
-    <translate>Contact Person</translate>
-    &quot;[% HTML.escape(contact.cp_name) %]&quot;
-   </a>
-  [%- END %]
- </p>
-
- <hr>
-[% END %]
-
-<body>
-
- <div width="100%" class="listtop">
-  [% IF is_customer %]<translate>Customer details</translate>[% ELSE %]<translate>Vendor details</translate>[% END %] &quot;[% HTML.escape(name) %]&quot;
- </div>
-
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
- <a name="billing"><div class="listheading"><translate>Billing Address</translate></div></a>
-
- <table>
-  <tr>
-  [% IF is_customer %]
-   <td align="right"><translate>Customer Number</translate></td>
-   <td>[% HTML.escape(customernumber) %]</td>
-  [% ELSE %]
-   <td align="right"><translate>Vendor Number</translate></td>
-   <td>[% HTML.escape(vendornumber) %]</td>
-  [% END %]
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Company Name</translate></td>
-   <td>[% HTML.escape(name) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Department</translate></td>
-   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Street</translate></td>
-   <td>[% HTML.escape(street) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Zip, City</translate></td>
-   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Country</translate></td>
-   <td>[% HTML.escape(country) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Contact Person</translate></td>
-   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Phone</translate></td>
-   <td>[% HTML.escape(phone) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Fax</translate></td>
-   <td>[% HTML.escape(fax) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>E-mail</translate></td>
-   <td>[% HTML.escape(email) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Homepage</translate></td>
-   <td>[% HTML.escape(homepage) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Credit Limit</translate></td>
-   <td>[% HTML.escape(creditlimit) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Discount</translate></td>
-   <td>[% HTML.escape(discount) %]%</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Payment Terms</translate></td>
-   <td>[% HTML.escape(payment_terms) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Tax Number</translate></td>
-   <td>[% HTML.escape(taxnumber) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>USt-IdNr.</translate></td>
-   <td>[% HTML.escape(ustid) %]</td>
-  </tr>
-
-  [% IF is_customer %]
-   <tr>
-    <td align="right"><translate>KNr. beim Kunden</translate></td>
-    <td>[% HTML.escape(c_vendor_id) %]</td>
-   </tr>
-  [% END %]
-
-  <tr>
-   <td align="right"><translate>Account Number</translate></td>
-   <td>[% HTML.escape(account_number) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Bank Code</translate></td>
-   <td>[% HTML.escape(bank_code) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Bank</translate></td>
-   <td>[% HTML.escape(bank) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right">[% IF is_customer %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</td>
-   <td>[% HTML.escape(business) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right"><translate>Language</translate></td>
-   <td>[% HTML.escape(language) %]</td>
-  </tr>
-
-  <tr>
-   <td align="right" valign="top"><translate>Notes</translate></td>
-   <td valign="top">[% HTML.escape(notes) %]</td>
-  </tr>
-
- </table>
-
-
-
-
- [% FOREACH row = SHIPTO %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="shipping[% loop.count %]"><div class="listheading"><translate>Shipping Address</translate> &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right"><translate>Company Name</translate></td>
-    <td>[% HTML.escape(row.shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Department</translate></td>
-    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Street</translate></td>
-    <td>[% HTML.escape(row.shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Zip, City</translate></td>
-    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Country</translate></td>
-    <td>[% HTML.escape(row.shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Contact Person</translate></td>
-    <td>[% HTML.escape(row.shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Phone</translate></td>
-    <td>[% HTML.escape(row.shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Fax</translate></td>
-    <td>[% HTML.escape(row.shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>E-mail</translate></td>
-    <td>[% HTML.escape(row.shiptoemail) %]</td>
-   </tr>
-
-  </table>
- [% END %]
-
-
-
-
-
-
-
-
-
-
- [% FOREACH row = CONTACTS %]
-
-  <hr>
-
-  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
-
-  <a name="contact[% loop.count %]"><div class="listheading"><translate>Contact Person</translate> &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
-
-  <table>
-   <tr>
-    <td align="right"><translate>Greeting</translate></td>
-    <td>[% HTML.escape(row.cp_greeting) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Title</translate></td>
-    <td>[% HTML.escape(row.cp_title) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Given Name</translate></td>
-    <td>[% HTML.escape(row.cp_givenname) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Name</translate></td>
-    <td>[% HTML.escape(row.cp_name) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Department</translate></td>
-    <td>[% HTML.escape(row.cp_abteilung) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Phone1</translate></td>
-    <td>[% HTML.escape(row.cp_phone1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Phone2</translate></td>
-    <td>[% HTML.escape(row.cp_phone2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Fax</translate></td>
-    <td>[% HTML.escape(row.cp_fax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Mobile1</translate></td>
-    <td>[% HTML.escape(row.cp_mobile1) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Mobile2</translate></td>
-    <td>[% HTML.escape(row.cp_mobile2) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Sat. Phone</translate></td>
-    <td>[% HTML.escape(row.cp_satphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Sat. Fax</translate></td>
-    <td>[% HTML.escape(row.cp_satfax) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Project</translate></td>
-    <td>[% HTML.escape(row.cp_project) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>E-mail</translate></td>
-    <td>[% HTML.escape(row.cp_email) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Private Phone</translate></td>
-    <td>[% HTML.escape(row.cp_privatphone) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Private E-mail</translate></td>
-    <td>[% HTML.escape(row.cp_privatemail) %]</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Birthday</translate></td>
-    <td>[% HTML.escape(row.cp_birthday) %]</td>
-   </tr>
-
-  </table>
-
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/ct/ajax_autocomplete.html b/templates/webpages/ct/ajax_autocomplete.html
new file mode 100644 (file)
index 0000000..25ab8c3
--- /dev/null
@@ -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_de.html b/templates/webpages/ct/ajax_autocomplete_de.html
deleted file mode 100644 (file)
index 25ab8c3..0000000
+++ /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/ajax_autocomplete_en.html b/templates/webpages/ct/ajax_autocomplete_en.html
deleted file mode 100644 (file)
index 25ab8c3..0000000
+++ /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/ajax_autocomplete_master.html b/templates/webpages/ct/ajax_autocomplete_master.html
deleted file mode 100644 (file)
index 25ab8c3..0000000
+++ /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 (file)
index 0000000..0fc5289
--- /dev/null
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
+<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
+<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
+
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
+
+<br>
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save' | $T8 %]">
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save and Close' | $T8 %]">
+  [%- IF is_customer %]
+  <input class="submit" type="submit" name="action" value="[% 'Save and AR Transaction' | $T8 %]">
+  [%- ELSE %]
+  <input class="submit" type="submit" name="action" value="[% 'Save and AP Transaction' | $T8 %]">
+  [%- END %]
+  <input class="submit" type="submit" name="action" value="[% 'Save and Invoice' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Order' | $T8 %]">
+  [%- IF is_customer %]
+  <input class="submit" type="submit" name="action" value="[% 'Save and Quotation' | $T8 %]">
+  [%- ELSE %]
+  <input class="submit" type="submit" name="action" value="[% 'Save and RFQ' | $T8 %]">
+  [%- END %]
+[%- IF id AND is_orphaned %]
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+[%- END %]
+[%- IF id %]
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+[%- END %]
+
+  </form>
+
+ <script type="text/javascript">
+  <!--
+      Calendar.setup({ inputField : "from",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
+      Calendar.setup({ inputField : "to",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
+      Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
+
+      function enable_delete_shipto(used) { var s=document.getElementById('delete_shipto');  if (s) s.disabled = (used > 0 ? true : false); }
+      function enable_delete_contact(used){ var s=document.getElementById('delete_contact'); if (s) s.disabled = (used > 0 ? true : false); }
+
+      var maintab = new ddtabcontent("maintab");
+      maintab.setpersist(true);
+      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
+      maintab.init();
+
+    -->
+ </script>
+</body>
+</html>
diff --git a/templates/webpages/ct/form_footer_de.html b/templates/webpages/ct/form_footer_de.html
deleted file mode 100644 (file)
index 2f7546b..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]
-
-<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
-<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
-<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
-
-<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
-
-<br>
-  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern">
-  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern und schließen">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Speichern und Debitorenbuchung erfassen">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Speichern und Kreditorenbuchung erfassen">
-  [%- END %]
-  <input class="submit" type="submit" name="action" value="Speichern und Rechnung erfassen">
-  <input class="submit" type="submit" name="action" value="Speichern und Auftrag erfassen">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Speichern und Angebot">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Speichern und Lieferantenanfrage">
-  [%- END %]
-[%- IF id AND is_orphaned %]
-  <input class="submit" type="submit" name="action" value="Löschen">
-[%- END %]
-[%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="Historie">
-[%- END %]
-
-  </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "from",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
-      Calendar.setup({ inputField : "to",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
-      Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
-
-      function enable_delete_shipto(used) { var s=document.getElementById('delete_shipto');  if (s) s.disabled = (used > 0 ? true : false); }
-      function enable_delete_contact(used){ var s=document.getElementById('delete_contact'); if (s) s.disabled = (used > 0 ? true : false); }
-
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-
-    -->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/ct/form_footer_en.html b/templates/webpages/ct/form_footer_en.html
deleted file mode 100644 (file)
index 0d715b6..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]
-
-<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
-<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
-<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
-
-<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
-
-<br>
-  <input class="submit" type="submit" name="action" accesskey="s" value="Save">
-  <input class="submit" type="submit" name="action" accesskey="s" value="Save and Close">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Save and AR Transaction">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Save and AP Transaction">
-  [%- END %]
-  <input class="submit" type="submit" name="action" value="Save and Invoice">
-  <input class="submit" type="submit" name="action" value="Save and Order">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Save and Quotation">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Save and RFQ">
-  [%- END %]
-[%- IF id AND is_orphaned %]
-  <input class="submit" type="submit" name="action" value="Delete">
-[%- END %]
-[%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="history">
-[%- END %]
-
-  </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "from",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
-      Calendar.setup({ inputField : "to",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
-      Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
-
-      function enable_delete_shipto(used) { var s=document.getElementById('delete_shipto');  if (s) s.disabled = (used > 0 ? true : false); }
-      function enable_delete_contact(used){ var s=document.getElementById('delete_contact'); if (s) s.disabled = (used > 0 ? true : false); }
-
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-
-    -->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/ct/form_footer_master.html b/templates/webpages/ct/form_footer_master.html
deleted file mode 100644 (file)
index cf53617..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-[% USE HTML %]
-
-<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
-<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
-<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
-
-<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
-
-<br>
-  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save</translate>">
-  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save and Close</translate>">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and AR Transaction</translate>">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and AP Transaction</translate>">
-  [%- END %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and Invoice</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Save and Order</translate>">
-  [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and Quotation</translate>">
-  [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and RFQ</translate>">
-  [%- END %]
-[%- IF id AND is_orphaned %]
-  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-[%- END %]
-[%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="<translate>history</translate>">
-[%- END %]
-
-  </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "from",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
-      Calendar.setup({ inputField : "to",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
-      Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
-
-      function enable_delete_shipto(used) { var s=document.getElementById('delete_shipto');  if (s) s.disabled = (used > 0 ? true : false); }
-      function enable_delete_contact(used){ var s=document.getElementById('delete_contact'); if (s) s.disabled = (used > 0 ? true : false); }
-
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-
-    -->
- </script>
-</body>
-</html>
diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
new file mode 100644 (file)
index 0000000..71a2a16
--- /dev/null
@@ -0,0 +1,658 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body onLoad="fokus()">
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="billing">[% 'Billing Address' | $T8 %]</a></li>
+   <li><a href="#" rel="shipto">[% 'Shipping Address' | $T8 %]</a></li>
+   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
+   <li><a href="#" rel="deliveries">[% 'Lieferungen' | $T8 %]</a></li>
+   <li><a href="#" rel="vcnotes">[% 'Notes' | $T8 %]</a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+
+   <div id="billing" class="tabcontent">
+
+    <table width="100%">
+     <tr height="5"></tr>
+     [% IF conf_vertreter %]
+      <tr>
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][%- ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       </td>
+      </tr>
+      <tr>
+       <th align="right">[% 'Representative' | $T8 %]</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name      = 'salesman_id',
+              DATA      = ALL_SALESMAN_CUSTOMERS,
+              id_key    = 'id',
+              label_key = 'name',
+        -%]
+       </td>
+      </tr>
+     [%- END %]
+     <tr>
+      [%- IF is_customer %]
+      <th align="right" nowrap>[% 'Customer Number' | $T8 %]</th>
+      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
+      [%- ELSE %]
+      <th align="right" nowrap>[% 'Vendor Number' | $T8 %]</th>
+      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Greeting' | $T8 %]</th>
+      <td>
+       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_company_greeting',
+             DATA       = MB_COMPANY_GREETINGS,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% IF is_customer %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
+      <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+      <td>
+       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
+       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
+      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
+      <td>
+       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
+       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
+      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
+      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
+      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
+      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
+      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Homepage' | $T8 %]</th>
+      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
+     </tr>
+    </table>
+
+    <table>
+     <tr>
+      <th align="right">[% 'Credit Limit' | $T8 %]</th>
+      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
+      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
+      <th align="right">[% 'Payment Terms' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'payment_id',
+             DATA       = payment_terms,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+
+      <th align="right">[% 'Discount' | $T8 %]</th>
+      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Tax Number / SSN' | $T8 %]</th>
+      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
+      <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
+      <th align="right">[% 'sales tax identification number' | $T8 %]</th>
+      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
+      [%- IF is_customer %]
+      <th align="right">[% 'our vendor number at customer' | $T8 %]</th>
+      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
+      [%- ELSE %]
+      <th align="right">[% 'Customer Number' | $T8 %]</th>
+      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Account Number' | $T8 %]</th>
+      <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
+      <th align="right">[% 'Bank Code Number' | $T8 %]</th>
+      <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
+      <th align="right">[% 'Bank' | $T8 %]</th>
+      <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'IBAN' | $T8 %]</th>
+      <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
+      <th align="right">[% 'BIC' | $T8 %]</th>
+      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
+     </tr>
+
+     [%- IF conf_vertreter %]
+      <tr>
+       <th align="right">[% 'Username' | $T8 %]</th>
+       <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
+       <th align="right">[% 'Password' | $T8 %]</th>
+       <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
+      </tr>
+     [%- END %]
+
+     <tr>
+      [% UNLESS conf_vertreter %]
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][% ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
+       <td>
+        [%- INCLUDE generic/multibox.html
+              name       = 'business',
+              DATA       = all_business,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+       </td>
+      [%- END %]
+      <th align="right">[% 'Language' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'language_id',
+             DATA       = languages,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+
+      [%- IF is_customer %]
+      <th align="right">[% 'Preisklasse' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'klass',
+             DATA       = all_pricegroup,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'pricegroup',
+       -%]
+      </td>
+      [%- END  %]
+     </tr>
+
+     <tr>
+      <td align="right">[% 'Obsolete' | $T8 %]</td>
+      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
+      <td align="right">[% 'direct debit' | $T8 %]</td>
+      <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Steuersatz' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'taxzone_id',
+             DATA       = ALL_TAXZONES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+      [%- IF is_customer && !conf_vertreter %]
+      <th align="right">[% 'Salesman' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'salesman_id',
+             DATA       = ALL_SALESMEN,
+             show_empty = 1,
+             id_key     = 'id',
+             label_sub  = 'salesman_label',
+       -%]
+      </td>
+      [%- END %]
+     </tr>
+    </table>
+
+    <table>
+     <tr>
+      <th align="left" nowrap>[% 'Notes' | $T8 %]</th>
+     </tr>
+
+     <tr>
+      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="shipto" class="tabcontent">
+
+    <table width="100%">
+     <tr>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
+      <td>
+       [%- 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',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Company Name' | $T8 %]</th>
+      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Abteilung' | $T8 %]</th>
+      <td>
+       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
+       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
+      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
+      <td>
+       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
+       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
+      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
+      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
+      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
+      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
+      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
+     </tr>
+
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+    </table>
+
+    <input type="submit" id="delete_shipto" name="action" value="[% 'Delete Shipto' | $T8 %]" disabled>
+    <br style="clear: left" />
+   </div>
+
+   <div id="contacts" class="tabcontent">
+    <table>
+     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
+     <tr>
+      <th align="right">[% 'Ansprechpartner' | $T8 %]</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'cp_id',
+             id         = 'cp_id',
+             DATA       = CONTACTS,
+             onChange   = "on_contact_changed()",
+             id_key     = 'cp_id',
+             label_sub  = 'contacts_label',
+       -%]
+      </td>
+     </tr>
+
+    <tr>
+     <th align="left" nowrap>[% 'Gender' | $T8 %]</th>
+     <td>
+      <select id="cp_gender" name="cp_gender">
+       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>[% 'male' | $T8 %]</option>
+       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>[% 'female' | $T8 %]</option>
+      </select>
+     </td>
+    </tr>
+    <tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Title' | $T8 %]</th>
+      <td>
+       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_title',
+             id         = 'selected_cp_title',
+             DATA       = MB_TITLES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Department' | $T8 %]</th>
+      <td>
+       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_abteilung',
+             id         = 'selected_cp_abteilung',
+             DATA       = MB_DEPARTMENT,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
+      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Name' | $T8 %]</th>
+      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Phone1' | $T8 %]</th>
+      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Phone2' | $T8 %]</th>
+      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Fax' | $T8 %]</th>
+      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Mobile1' | $T8 %]</th>
+      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Mobile2' | $T8 %]</th>
+      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Sat. Phone' | $T8 %]</th>
+      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Sat. Fax' | $T8 %]</th>
+      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Project' | $T8 %]</th>
+      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'E-mail' | $T8 %]</th>
+      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
+      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
+      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
+      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
+     </tr>
+
+     <tr>
+      <td colspan="2"><hr></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>[% 'Bcc' | $T8 %]</th>
+      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
+     </tr>
+    </table>
+
+    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]" disabled>
+    <br style="clear: left" />
+   </div>
+
+   <div id="deliveries" class="tabcontent">
+    <table>
+     <tr>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
+      <td>
+       [%- 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',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>[% 'From' | $T8 %]</th>
+      <td>
+       <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
+       <input type="button" name="fromB" id="trigger_from" value="?">
+      </td>
+      <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
+      <td>
+       <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
+       <input type="button" name="toB" id="trigger_to" value="?">
+      </td>
+     </tr>
+
+     <tr>
+      <td colspan="4">
+       <div id="delivery">
+       </div>
+      </td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="vcnotes" class="tabcontent">
+
+    [%- IF NOTES && NOTES.size %]
+    <p>
+     <table>
+      <tr>
+       <th class="listheading">[% 'Delete' | $T8 %]</th>
+       <th class="listheading">[% 'Subject' | $T8 %]</th>
+       <th class="listheading">[% 'Created on' | $T8 %]</th>
+       <th class="listheading">[% 'Created by' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up for' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up done' | $T8 %]</th>
+      </tr>
+
+      [%- FOREACH row = NOTES %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
+       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
+       <td>[% HTML.escape(row.created_on) %]</td>
+       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
+       <td>[% HTML.escape(row.follow_up_date) %]</td>
+       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
+       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %][% END %]</td>
+      </tr>
+      [%- END %]
+
+      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
+
+     </table>
+    </p>
+    [%- END %]
+
+    <div class="listtop">[% IF NOTE_id %][% 'Edit note' | $T8 %][% ELSE %][% 'Add note' | $T8 %][% END %]</div>
+
+    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
+    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
+
+    <p>
+     <table>
+      <tr>
+       <td valign="right">[% 'Subject' | $T8 %]</td>
+       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
+      </tr>
+
+      <tr>
+       <td valign="right" align="top">[% 'Body' | $T8 %]</td>
+       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
+      </tr>
+
+      <tr>
+       <td valign="right">[% 'Follow-Up On' | $T8 %]</td>
+       <td>
+        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
+        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
+        [% 'for' | $T8 %]
+        <select name="FU_created_for_user">
+         [%- FOREACH row = ALL_EMPLOYEES %]
+         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
+          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
+         </option>
+         [%- END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <td>&nbsp;</td>
+       <td>
+        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
+        <label for="FU_done">[% 'Follow-Up done' | $T8 %]</label>
+       </td>
+      </tr>
+     </table>
+    </p>
+
+    <br style="clear: left" />
+   </div>
+
+   [%- IF CUSTOM_VARIABLES.size %]
+   <div id="custom_variables" class="tabcontent">
+
+    <p>
+     <table>
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      <tr>
+       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
+       <td valign="top">[% var.HTML_CODE %]</td>
+      </tr>
+      [%- END %]
+     </table>
+    </p>
+
+    <br style="clear: left" />
+   </div>
+   [%- END %]
+
+  </div>
+
+  <script type="text/javascript" src="js/jquery.js"></script>
+  <script type="text/javascript">
+   <!--
+   function set_gender(gender) {
+     var s = document.getElementById('cp_gender');
+     if (s) {
+       s.selectedIndex = (gender == 'f') ? 1 : 0;
+     }
+   }
+
+   function on_contact_changed() {
+     get_contact(['cp_id__' + $('#cp_id').attr('value')],
+                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
+                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
+     $('#selected_cp_title').attr('selectedIndex', 0);
+     $('#selected_cp_abteilung').attr('selectedIndex', 0);
+   }
+  -->
+
+  </script>
diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
deleted file mode 100644 (file)
index 8d885dc..0000000
+++ /dev/null
@@ -1,657 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body onLoad="fokus()">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="billing">Rechnungsadresse</a></li>
-   <li><a href="#" rel="shipto">Lieferadresse</a></li>
-   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
-   <li><a href="#" rel="deliveries">Lieferungen</a></li>
-   <li><a href="#" rel="vcnotes">Bemerkungen</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="billing" class="tabcontent">
-
-    <table width="100%">
-     <tr height="5"></tr>
-     [% IF conf_vertreter %]
-      <tr>
-       <th align="right">[% IF is_customer %]Kundentyp[%- ELSE %]Lieferantentyp[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Vertreter</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name      = 'salesman_id',
-              DATA      = ALL_SALESMAN_CUSTOMERS,
-              id_key    = 'id',
-              label_key = 'name',
-        -%]
-       </td>
-      </tr>
-     [%- END %]
-     <tr>
-      [%- IF is_customer %]
-      <th align="right" nowrap>Kundennummer</th>
-      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
-      [%- ELSE %]
-      <th align="right" nowrap>Lieferantennummer</th>
-      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Anrede</th>
-      <td>
-       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_company_greeting',
-             DATA       = MB_COMPANY_GREETINGS,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>[% IF is_customer %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
-      <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Abteilung</th>
-      <td>
-       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
-       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Straße</th>
-      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>PLZ/Stadt</th>
-      <td>
-       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
-       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Land</th>
-      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Kontakt</th>
-      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Telefon</th>
-      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Fax</th>
-      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>eMail</th>
-      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Homepage</th>
-      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="right">Kreditlimit</th>
-      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
-      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-      <th align="right">Zahlungskonditionen</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'payment_id',
-             DATA       = payment_terms,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      <th align="right">Rabatt</th>
-      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
-     </tr>
-
-     <tr>
-      <th align="right">Steuernummer</th>
-      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
-      <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
-      <th align="right">USt-IdNr.</th>
-      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
-      [%- IF is_customer %]
-      <th align="right">unsere Lieferanten-Nr. beim Kunden</th>
-      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
-      [%- ELSE %]
-      <th align="right">Kundennummer</th>
-      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right">Kontonummer</th>
-      <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
-      <th align="right">Bankleitzahl</th>
-      <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
-      <th align="right">Bank</th>
-      <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">IBAN</th>
-      <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
-      <th align="right">BIC</th>
-      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
-     </tr>
-
-     [%- IF conf_vertreter %]
-      <tr>
-       <th align="right">Benutzername</th>
-       <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
-       <th align="right">Passwort</th>
-       <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
-      </tr>
-     [%- END %]
-
-     <tr>
-      [% UNLESS conf_vertreter %]
-       <th align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      [%- END %]
-      <th align="right">Sprache</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'language_id',
-             DATA       = languages,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      [%- IF is_customer %]
-      <th align="right">Preisgruppe</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'klass',
-             DATA       = all_pricegroup,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'pricegroup',
-       -%]
-      </td>
-      [%- END  %]
-     </tr>
-
-     <tr>
-      <td align="right">Ungültig</td>
-      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-      <td align="right">Lastschrift</td>
-      <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
-     </tr>
-
-     <tr>
-      <th align="right">Steuersatz</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'taxzone_id',
-             DATA       = ALL_TAXZONES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-      [%- IF is_customer && !conf_vertreter %]
-      <th align="right">Verkäufer/in</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'salesman_id',
-             DATA       = ALL_SALESMEN,
-             show_empty = 1,
-             id_key     = 'id',
-             label_sub  = 'salesman_label',
-       -%]
-      </td>
-      [%- END %]
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="left" nowrap>Bemerkungen</th>
-     </tr>
-
-     <tr>
-      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="shipto" class="tabcontent">
-
-    <table width="100%">
-     <tr>
-      <th align="right">Lieferadresse</th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Firmenname</th>
-      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Abteilung</th>
-      <td>
-       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
-       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Straße</th>
-      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>PLZ/Stadt</th>
-      <td>
-       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
-       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Land</th>
-      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Kontakt</th>
-      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Telefon</th>
-      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Fax</th>
-      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>eMail</th>
-      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
-     </tr>
-
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_shipto" name="action" value="Lieferadresse löschen" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="contacts" class="tabcontent">
-    <table>
-     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-     <tr>
-      <th align="right">Ansprechpartner</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'cp_id',
-             id         = 'cp_id',
-             DATA       = CONTACTS,
-             onChange   = "on_contact_changed()",
-             id_key     = 'cp_id',
-             label_sub  = 'contacts_label',
-       -%]
-      </td>
-     </tr>
-
-    <tr>
-     <th align="left" nowrap>Geschlecht</th>
-     <td>
-      <select id="cp_gender" name="cp_gender">
-       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>männlich</option>
-       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>weiblich</option>
-      </select>
-     </td>
-    </tr>
-    <tr>
-
-     <tr>
-      <th align="left" nowrap>Titel</th>
-      <td>
-       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_title',
-             id         = 'selected_cp_title',
-             DATA       = MB_TITLES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Abteilung</th>
-      <td>
-       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_abteilung',
-             id         = 'selected_cp_abteilung',
-             DATA       = MB_DEPARTMENT,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Vorname</th>
-      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Name</th>
-      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Telefon 1 </th>
-      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Telefon 2</th>
-      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Fax</th>
-      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Mobile 1</th>
-      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Mobile 2</th>
-      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Sat. Tel.</th>
-      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Sat. Fax</th>
-      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Projekt</th>
-      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>eMail</th>
-      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Privates Tel.</th>
-      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Private eMail</th>
-      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Geburtstag</th>
-      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
-     </tr>
-
-     <tr>
-      <td colspan="2"><hr></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Bcc</th>
-      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_contact" name="action" value="Ansprechpartner löschen" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="deliveries" class="tabcontent">
-    <table>
-     <tr>
-      <th align="right">Lieferadresse</th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Von</th>
-      <td>
-       <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
-       <input type="button" name="fromB" id="trigger_from" value="?">
-      </td>
-      <th align="right" nowrap>Bis</th>
-      <td>
-       <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
-       <input type="button" name="toB" id="trigger_to" value="?">
-      </td>
-     </tr>
-
-     <tr>
-      <td colspan="4">
-       <div id="delivery">
-       </div>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="vcnotes" class="tabcontent">
-
-    [%- IF NOTES && NOTES.size %]
-    <p>
-     <table>
-      <tr>
-       <th class="listheading">Löschen</th>
-       <th class="listheading">Betreff</th>
-       <th class="listheading">Erstellt am</th>
-       <th class="listheading">Erstellt von</th>
-       <th class="listheading">Wiedervorlagedatum</th>
-       <th class="listheading">Wiedervorlage f&uuml;r</th>
-       <th class="listheading">Wiedervorlage erledigt</th>
-      </tr>
-
-      [%- FOREACH row = NOTES %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
-       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-       <td>[% HTML.escape(row.created_on) %]</td>
-       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
-       <td>[% HTML.escape(row.follow_up_date) %]</td>
-       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]</td>
-      </tr>
-      [%- END %]
-
-      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
-
-     </table>
-    </p>
-    [%- END %]
-
-    <div class="listtop">[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]</div>
-
-    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
-    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
-
-    <p>
-     <table>
-      <tr>
-       <td valign="right">Betreff</td>
-       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
-      </tr>
-
-      <tr>
-       <td valign="right" align="top">Text</td>
-       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <td valign="right">Wiedervorlage am</td>
-       <td>
-        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
-        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-        f&uuml;r
-        <select name="FU_created_for_user">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
-          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-         </option>
-         [%- END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-        <label for="FU_done">Wiedervorlage erledigt</label>
-       </td>
-      </tr>
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-   function set_gender(gender) {
-     var s = document.getElementById('cp_gender');
-     if (s) {
-       s.selectedIndex = (gender == 'f') ? 1 : 0;
-     }
-   }
-
-   function on_contact_changed() {
-     get_contact(['cp_id__' + $('#cp_id').attr('value')],
-                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
-                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
-     $('#selected_cp_title').attr('selectedIndex', 0);
-     $('#selected_cp_abteilung').attr('selectedIndex', 0);
-   }
-  -->
-
-  </script>
diff --git a/templates/webpages/ct/form_header_en.html b/templates/webpages/ct/form_header_en.html
deleted file mode 100644 (file)
index 3c08ffb..0000000
+++ /dev/null
@@ -1,657 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body onLoad="fokus()">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="billing">Billing Address</a></li>
-   <li><a href="#" rel="shipto">Shipping Address</a></li>
-   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
-   <li><a href="#" rel="deliveries">Lieferungen</a></li>
-   <li><a href="#" rel="vcnotes">Notes</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Custom Variables</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="billing" class="tabcontent">
-
-    <table width="100%">
-     <tr height="5"></tr>
-     [% IF conf_vertreter %]
-      <tr>
-       <th align="right">[% IF is_customer %]Type of Customer[%- ELSE %]Type of Vendor[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Representative</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name      = 'salesman_id',
-              DATA      = ALL_SALESMAN_CUSTOMERS,
-              id_key    = 'id',
-              label_key = 'name',
-        -%]
-       </td>
-      </tr>
-     [%- END %]
-     <tr>
-      [%- IF is_customer %]
-      <th align="right" nowrap>Customer Number</th>
-      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
-      [%- ELSE %]
-      <th align="right" nowrap>Vendor Number</th>
-      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Greeting</th>
-      <td>
-       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_company_greeting',
-             DATA       = MB_COMPANY_GREETINGS,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>[% IF is_customer %]Customer Name[%- ELSE %]Vendor Name[%- END %]</th>
-      <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Department</th>
-      <td>
-       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
-       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Street</th>
-      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Zipcode/City</th>
-      <td>
-       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
-       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Country</th>
-      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Contact</th>
-      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Phone</th>
-      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Fax</th>
-      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>E-mail</th>
-      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Homepage</th>
-      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="right">Credit Limit</th>
-      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
-      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-      <th align="right">Payment Terms</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'payment_id',
-             DATA       = payment_terms,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      <th align="right">Discount</th>
-      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
-     </tr>
-
-     <tr>
-      <th align="right">Tax Number / SSN</th>
-      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
-      <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
-      <th align="right">sales tax identification number</th>
-      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
-      [%- IF is_customer %]
-      <th align="right">our vendor number at customer</th>
-      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
-      [%- ELSE %]
-      <th align="right">Customer Number</th>
-      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right">Account Number</th>
-      <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
-      <th align="right">Bank Code Number</th>
-      <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
-      <th align="right">Bank</th>
-      <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">IBAN</th>
-      <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
-      <th align="right">BIC</th>
-      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
-     </tr>
-
-     [%- IF conf_vertreter %]
-      <tr>
-       <th align="right">Username</th>
-       <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
-       <th align="right">Password</th>
-       <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
-      </tr>
-     [%- END %]
-
-     <tr>
-      [% UNLESS conf_vertreter %]
-       <th align="right">[% IF is_customer %]Type of Customer[% ELSE %]Type of Vendor[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      [%- END %]
-      <th align="right">Language</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'language_id',
-             DATA       = languages,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      [%- IF is_customer %]
-      <th align="right">Preisklasse</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'klass',
-             DATA       = all_pricegroup,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'pricegroup',
-       -%]
-      </td>
-      [%- END  %]
-     </tr>
-
-     <tr>
-      <td align="right">Obsolete</td>
-      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-      <td align="right">direct debit</td>
-      <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
-     </tr>
-
-     <tr>
-      <th align="right">Steuersatz</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'taxzone_id',
-             DATA       = ALL_TAXZONES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-      [%- IF is_customer && !conf_vertreter %]
-      <th align="right">Salesman</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'salesman_id',
-             DATA       = ALL_SALESMEN,
-             show_empty = 1,
-             id_key     = 'id',
-             label_sub  = 'salesman_label',
-       -%]
-      </td>
-      [%- END %]
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="left" nowrap>Notes</th>
-     </tr>
-
-     <tr>
-      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="shipto" class="tabcontent">
-
-    <table width="100%">
-     <tr>
-      <th align="right">Shipping Address</th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Company Name</th>
-      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Abteilung</th>
-      <td>
-       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
-       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Street</th>
-      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Zipcode/City</th>
-      <td>
-       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
-       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Country</th>
-      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Contact</th>
-      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Phone</th>
-      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>Fax</th>
-      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>E-mail</th>
-      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
-     </tr>
-
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_shipto" name="action" value="Delete Shipto" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="contacts" class="tabcontent">
-    <table>
-     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-     <tr>
-      <th align="right">Ansprechpartner</th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'cp_id',
-             id         = 'cp_id',
-             DATA       = CONTACTS,
-             onChange   = "on_contact_changed()",
-             id_key     = 'cp_id',
-             label_sub  = 'contacts_label',
-       -%]
-      </td>
-     </tr>
-
-    <tr>
-     <th align="left" nowrap>Gender</th>
-     <td>
-      <select id="cp_gender" name="cp_gender">
-       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>male</option>
-       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>female</option>
-      </select>
-     </td>
-    </tr>
-    <tr>
-
-     <tr>
-      <th align="left" nowrap>Title</th>
-      <td>
-       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_title',
-             id         = 'selected_cp_title',
-             DATA       = MB_TITLES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Department</th>
-      <td>
-       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_abteilung',
-             id         = 'selected_cp_abteilung',
-             DATA       = MB_DEPARTMENT,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Given Name</th>
-      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Name</th>
-      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Phone1</th>
-      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Phone2</th>
-      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Fax</th>
-      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Mobile1</th>
-      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Mobile2</th>
-      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Sat. Phone</th>
-      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Sat. Fax</th>
-      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Project</th>
-      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>E-mail</th>
-      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Private Phone</th>
-      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Private E-mail</th>
-      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Birthday</th>
-      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
-     </tr>
-
-     <tr>
-      <td colspan="2"><hr></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap>Bcc</th>
-      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_contact" name="action" value="Delete Contact" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="deliveries" class="tabcontent">
-    <table>
-     <tr>
-      <th align="right">Shipping Address</th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>From</th>
-      <td>
-       <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
-       <input type="button" name="fromB" id="trigger_from" value="?">
-      </td>
-      <th align="right" nowrap>To (time)</th>
-      <td>
-       <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
-       <input type="button" name="toB" id="trigger_to" value="?">
-      </td>
-     </tr>
-
-     <tr>
-      <td colspan="4">
-       <div id="delivery">
-       </div>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="vcnotes" class="tabcontent">
-
-    [%- IF NOTES && NOTES.size %]
-    <p>
-     <table>
-      <tr>
-       <th class="listheading">Delete</th>
-       <th class="listheading">Subject</th>
-       <th class="listheading">Created on</th>
-       <th class="listheading">Created by</th>
-       <th class="listheading">Follow-Up Date</th>
-       <th class="listheading">Follow-Up for</th>
-       <th class="listheading">Follow-Up done</th>
-      </tr>
-
-      [%- FOREACH row = NOTES %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
-       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-       <td>[% HTML.escape(row.created_on) %]</td>
-       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
-       <td>[% HTML.escape(row.follow_up_date) %]</td>
-       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]Yes[% ELSE %]No[% END %][% END %]</td>
-      </tr>
-      [%- END %]
-
-      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
-
-     </table>
-    </p>
-    [%- END %]
-
-    <div class="listtop">[% IF NOTE_id %]Edit note[% ELSE %]Add note[% END %]</div>
-
-    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
-    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
-
-    <p>
-     <table>
-      <tr>
-       <td valign="right">Subject</td>
-       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
-      </tr>
-
-      <tr>
-       <td valign="right" align="top">Body</td>
-       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <td valign="right">Follow-Up On</td>
-       <td>
-        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
-        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-        for
-        <select name="FU_created_for_user">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
-          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-         </option>
-         [%- END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-        <label for="FU_done">Follow-Up done</label>
-       </td>
-      </tr>
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-   function set_gender(gender) {
-     var s = document.getElementById('cp_gender');
-     if (s) {
-       s.selectedIndex = (gender == 'f') ? 1 : 0;
-     }
-   }
-
-   function on_contact_changed() {
-     get_contact(['cp_id__' + $('#cp_id').attr('value')],
-                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
-                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
-     $('#selected_cp_title').attr('selectedIndex', 0);
-     $('#selected_cp_abteilung').attr('selectedIndex', 0);
-   }
-  -->
-
-  </script>
diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
deleted file mode 100644 (file)
index ec9a62a..0000000
+++ /dev/null
@@ -1,657 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body onLoad="fokus()">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="billing"><translate>Billing Address</translate></a></li>
-   <li><a href="#" rel="shipto"><translate>Shipping Address</translate></a></li>
-   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
-   <li><a href="#" rel="deliveries"><translate>Lieferungen</translate></a></li>
-   <li><a href="#" rel="vcnotes"><translate>Notes</translate></a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="billing" class="tabcontent">
-
-    <table width="100%">
-     <tr height="5"></tr>
-     [% IF conf_vertreter %]
-      <tr>
-       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[%- ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      </tr>
-      <tr>
-       <th align="right"><translate>Representative</translate></th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name      = 'salesman_id',
-              DATA      = ALL_SALESMAN_CUSTOMERS,
-              id_key    = 'id',
-              label_key = 'name',
-        -%]
-       </td>
-      </tr>
-     [%- END %]
-     <tr>
-      [%- IF is_customer %]
-      <th align="right" nowrap><translate>Customer Number</translate></th>
-      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
-      [%- ELSE %]
-      <th align="right" nowrap><translate>Vendor Number</translate></th>
-      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Greeting</translate></th>
-      <td>
-       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_company_greeting',
-             DATA       = MB_COMPANY_GREETINGS,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap>[% IF is_customer %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
-      <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Department</translate></th>
-      <td>
-       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
-       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Street</translate></th>
-      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
-      <td>
-       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
-       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Country</translate></th>
-      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Contact</translate></th>
-      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Phone</translate></th>
-      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Fax</translate></th>
-      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>E-mail</translate></th>
-      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Homepage</translate></th>
-      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="right"><translate>Credit Limit</translate></th>
-      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
-      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-      <th align="right"><translate>Payment Terms</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'payment_id',
-             DATA       = payment_terms,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      <th align="right"><translate>Discount</translate></th>
-      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Tax Number / SSN</translate></th>
-      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
-      <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
-      <th align="right"><translate>sales tax identification number</translate></th>
-      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
-      [%- IF is_customer %]
-      <th align="right"><translate>our vendor number at customer</translate></th>
-      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
-      [%- ELSE %]
-      <th align="right"><translate>Customer Number</translate></th>
-      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
-      [%- END %]
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Account Number</translate></th>
-      <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
-      <th align="right"><translate>Bank Code Number</translate></th>
-      <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
-      <th align="right"><translate>Bank</translate></th>
-      <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>IBAN</translate></th>
-      <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
-      <th align="right"><translate>BIC</translate></th>
-      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
-     </tr>
-
-     [%- IF conf_vertreter %]
-      <tr>
-       <th align="right"><translate>Username</translate></th>
-       <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
-       <th align="right"><translate>Password</translate></th>
-       <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
-      </tr>
-     [%- END %]
-
-     <tr>
-      [% UNLESS conf_vertreter %]
-       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[% ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
-       <td>
-        [%- INCLUDE generic/multibox.html
-              name       = 'business',
-              DATA       = all_business,
-              show_empty = 1,
-              id_key     = 'id',
-              label_key  = 'description',
-        -%]
-       </td>
-      [%- END %]
-      <th align="right"><translate>Language</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'language_id',
-             DATA       = languages,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-
-      [%- IF is_customer %]
-      <th align="right"><translate>Preisklasse</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'klass',
-             DATA       = all_pricegroup,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'pricegroup',
-       -%]
-      </td>
-      [%- END  %]
-     </tr>
-
-     <tr>
-      <td align="right"><translate>Obsolete</translate></td>
-      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-      <td align="right"><translate>direct debit</translate></td>
-      <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Steuersatz</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'taxzone_id',
-             DATA       = ALL_TAXZONES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-      [%- IF is_customer && !conf_vertreter %]
-      <th align="right"><translate>Salesman</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'salesman_id',
-             DATA       = ALL_SALESMEN,
-             show_empty = 1,
-             id_key     = 'id',
-             label_sub  = 'salesman_label',
-       -%]
-      </td>
-      [%- END %]
-     </tr>
-    </table>
-
-    <table>
-     <tr>
-      <th align="left" nowrap><translate>Notes</translate></th>
-     </tr>
-
-     <tr>
-      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="shipto" class="tabcontent">
-
-    <table width="100%">
-     <tr>
-      <th align="right"><translate>Shipping Address</translate></th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Company Name</translate></th>
-      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Abteilung</translate></th>
-      <td>
-       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
-       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Street</translate></th>
-      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
-      <td>
-       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
-       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Country</translate></th>
-      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Contact</translate></th>
-      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Phone</translate></th>
-      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>Fax</translate></th>
-      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>E-mail</translate></th>
-      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
-     </tr>
-
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_shipto" name="action" value="<translate>Delete Shipto</translate>" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="contacts" class="tabcontent">
-    <table>
-     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-     <tr>
-      <th align="right"><translate>Ansprechpartner</translate></th>
-      <td>
-       [%- INCLUDE generic/multibox.html
-             name       = 'cp_id',
-             id         = 'cp_id',
-             DATA       = CONTACTS,
-             onChange   = "on_contact_changed()",
-             id_key     = 'cp_id',
-             label_sub  = 'contacts_label',
-       -%]
-      </td>
-     </tr>
-
-    <tr>
-     <th align="left" nowrap><translate>Gender</translate></th>
-     <td>
-      <select id="cp_gender" name="cp_gender">
-       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]><translate>male</translate></option>
-       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]><translate>female</translate></option>
-      </select>
-     </td>
-    </tr>
-    <tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Title</translate></th>
-      <td>
-       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_title',
-             id         = 'selected_cp_title',
-             DATA       = MB_TITLES,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Department</translate></th>
-      <td>
-       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
-       [%- INCLUDE generic/multibox.html
-             name       = 'selected_cp_abteilung',
-             id         = 'selected_cp_abteilung',
-             DATA       = MB_DEPARTMENT,
-             show_empty = 1,
-             id_key     = 'id',
-             label_key  = 'description',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Given Name</translate></th>
-      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Name</translate></th>
-      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Phone1</translate></th>
-      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Phone2</translate></th>
-      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Fax</translate></th>
-      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Mobile1</translate></th>
-      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Mobile2</translate></th>
-      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Sat. Phone</translate></th>
-      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Sat. Fax</translate></th>
-      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Project</translate></th>
-      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>E-mail</translate></th>
-      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Private Phone</translate></th>
-      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Private E-mail</translate></th>
-      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Birthday</translate></th>
-      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
-     </tr>
-
-     <tr>
-      <td colspan="2"><hr></td>
-     </tr>
-
-     <tr>
-      <th align="left" nowrap><translate>Bcc</translate></th>
-      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
-     </tr>
-    </table>
-
-    <input type="submit" id="delete_contact" name="action" value="<translate>Delete Contact</translate>" disabled>
-    <br style="clear: left" />
-   </div>
-
-   <div id="deliveries" class="tabcontent">
-    <table>
-     <tr>
-      <th align="right"><translate>Shipping Address</translate></th>
-      <td>
-       [%- 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',
-       -%]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right" nowrap><translate>From</translate></th>
-      <td>
-       <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
-       <input type="button" name="fromB" id="trigger_from" value="?">
-      </td>
-      <th align="right" nowrap><translate>To (time)</translate></th>
-      <td>
-       <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
-       <input type="button" name="toB" id="trigger_to" value="?">
-      </td>
-     </tr>
-
-     <tr>
-      <td colspan="4">
-       <div id="delivery">
-       </div>
-      </td>
-     </tr>
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   <div id="vcnotes" class="tabcontent">
-
-    [%- IF NOTES && NOTES.size %]
-    <p>
-     <table>
-      <tr>
-       <th class="listheading"><translate>Delete</translate></th>
-       <th class="listheading"><translate>Subject</translate></th>
-       <th class="listheading"><translate>Created on</translate></th>
-       <th class="listheading"><translate>Created by</translate></th>
-       <th class="listheading"><translate>Follow-Up Date</translate></th>
-       <th class="listheading"><translate>Follow-Up for</translate></th>
-       <th class="listheading"><translate>Follow-Up done</translate></th>
-      </tr>
-
-      [%- FOREACH row = NOTES %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
-       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-       <td>[% HTML.escape(row.created_on) %]</td>
-       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
-       <td>[% HTML.escape(row.follow_up_date) %]</td>
-       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %][% END %]</td>
-      </tr>
-      [%- END %]
-
-      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
-
-     </table>
-    </p>
-    [%- END %]
-
-    <div class="listtop">[% IF NOTE_id %]<translate>Edit note</translate>[% ELSE %]<translate>Add note</translate>[% END %]</div>
-
-    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
-    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
-
-    <p>
-     <table>
-      <tr>
-       <td valign="right"><translate>Subject</translate></td>
-       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
-      </tr>
-
-      <tr>
-       <td valign="right" align="top"><translate>Body</translate></td>
-       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
-      </tr>
-
-      <tr>
-       <td valign="right"><translate>Follow-Up On</translate></td>
-       <td>
-        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
-        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-        <translate>for</translate>
-        <select name="FU_created_for_user">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
-          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-         </option>
-         [%- END %]
-        </select>
-       </td>
-      </tr>
-
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-        <label for="FU_done"><translate>Follow-Up done</translate></label>
-       </td>
-      </tr>
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-   function set_gender(gender) {
-     var s = document.getElementById('cp_gender');
-     if (s) {
-       s.selectedIndex = (gender == 'f') ? 1 : 0;
-     }
-   }
-
-   function on_contact_changed() {
-     get_contact(['cp_id__' + $('#cp_id').attr('value')],
-                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
-                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
-     $('#selected_cp_title').attr('selectedIndex', 0);
-     $('#selected_cp_abteilung').attr('selectedIndex', 0);
-   }
-  -->
-
-  </script>
diff --git a/templates/webpages/ct/get_delivery.html b/templates/webpages/ct/get_delivery.html
new file mode 100644 (file)
index 0000000..73d2154
--- /dev/null
@@ -0,0 +1,41 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<table width="100%">
+  <tr>
+    <td>
+      <table width="100%">
+        <tr class="listheading">
+          <th class="listheading">[% 'Shipping Address' | $T8 %]</th>
+          <th class="listheading">[% 'Invoice' | $T8 %]</th>
+          <th class="listheading">[% 'Order' | $T8 %]</th>
+          <th class="listheading">[% 'Invdate' | $T8 %]</th>
+          <th class="listheading">[% 'Description' | $T8 %]</th>
+          <th class="listheading">[% 'Qty' | $T8 %]</th>
+          <th class="listheading">[% 'Unit' | $T8 %]</th>
+[%- IF is_customer %]
+          <th class="listheading">[% 'Sell Price' | $T8 %]</th>
+[%- ELSE %]
+          <th class="listheading">[% 'Last Cost' | $T8 %]</th>
+[%- END %]
+        </tr>
+[%- FOREACH row = DELIVERY %]
+[%-
+    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
+                             :  ( row.invoice ? 'ir' : 'ap' )
+-%]
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
+          <td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
+          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
+          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
+          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
+        </tr>
+[%- END %]
+
+     </table>
+[%- IF DELIVERY.size == 15 %]
+     <p>[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]</p>
+[%- END %]
diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html
deleted file mode 100644 (file)
index a8c0d97..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<table width="100%">
-  <tr>
-    <td>
-      <table width="100%">
-        <tr class="listheading">
-          <th class="listheading">Lieferadresse</th>
-          <th class="listheading">Rechnung</th>
-          <th class="listheading">Auftrag</th>
-          <th class="listheading">Rechnungsdatum</th>
-          <th class="listheading">Beschreibung</th>
-          <th class="listheading">Menge</th>
-          <th class="listheading">Einheit</th>
-[%- IF is_customer %]
-          <th class="listheading">Verkaufspreis</th>
-[%- ELSE %]
-          <th class="listheading">Einkaufspreis</th>
-[%- END %]
-        </tr>
-[%- FOREACH row = DELIVERY %]
-[%-
-    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
-                             :  ( row.invoice ? 'ir' : 'ap' )
--%]
-        <tr class="listrow[% loop.count % 2 %]">
-          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
-          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
-          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
-        </tr>
-[%- END %]
-
-     </table>
-[%- IF DELIVERY.size == 15 %]
-     <p>Diese Liste ist auf 15 Zeilen begrenzt. Wenn Sie eine vollständige Liste benötigen, erstellen Sie bitte einen Bericht.</p>
-[%- END %]
diff --git a/templates/webpages/ct/get_delivery_en.html b/templates/webpages/ct/get_delivery_en.html
deleted file mode 100644 (file)
index 745e71d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<table width="100%">
-  <tr>
-    <td>
-      <table width="100%">
-        <tr class="listheading">
-          <th class="listheading">Shipping Address</th>
-          <th class="listheading">Invoice</th>
-          <th class="listheading">Order</th>
-          <th class="listheading">Invdate</th>
-          <th class="listheading">Description</th>
-          <th class="listheading">Qty</th>
-          <th class="listheading">Unit</th>
-[%- IF is_customer %]
-          <th class="listheading">Sell Price</th>
-[%- ELSE %]
-          <th class="listheading">Last Cost</th>
-[%- END %]
-        </tr>
-[%- FOREACH row = DELIVERY %]
-[%-
-    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
-                             :  ( row.invoice ? 'ir' : 'ap' )
--%]
-        <tr class="listrow[% loop.count % 2 %]">
-          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
-          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
-          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
-        </tr>
-[%- END %]
-
-     </table>
-[%- IF DELIVERY.size == 15 %]
-     <p>This list is capped at 15 items to keep it fast. If you need a full list, please use reports.</p>
-[%- END %]
diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
deleted file mode 100644 (file)
index 156bd11..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<table width="100%">
-  <tr>
-    <td>
-      <table width="100%">
-        <tr class="listheading">
-          <th class="listheading"><translate>Shipping Address</translate></th>
-          <th class="listheading"><translate>Invoice</translate></th>
-          <th class="listheading"><translate>Order</translate></th>
-          <th class="listheading"><translate>Invdate</translate></th>
-          <th class="listheading"><translate>Description</translate></th>
-          <th class="listheading"><translate>Qty</translate></th>
-          <th class="listheading"><translate>Unit</translate></th>
-[%- IF is_customer %]
-          <th class="listheading"><translate>Sell Price</translate></th>
-[%- ELSE %]
-          <th class="listheading"><translate>Last Cost</translate></th>
-[%- END %]
-        </tr>
-[%- FOREACH row = DELIVERY %]
-[%-
-    row.script = is_customer ?  ( row.invoice ? 'is' : 'ar' )
-                             :  ( row.invoice ? 'ir' : 'ap' )
--%]
-        <tr class="listrow[% loop.count % 2 %]">
-          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
-          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
-          <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
-          <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
-        </tr>
-[%- END %]
-
-     </table>
-[%- IF DELIVERY.size == 15 %]
-     <p><translate>This list is capped at 15 items to keep it fast. If you need a full list, please use reports.</translate></p>
-[%- END %]
diff --git a/templates/webpages/ct/list_names_bottom.html b/templates/webpages/ct/list_names_bottom.html
new file mode 100644 (file)
index 0000000..0fd5389
--- /dev/null
@@ -0,0 +1,11 @@
+[%- USE T8 %]
+[% USE HTML %]<form method="post" action="ct.pl">
+
+ <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+ <input name="db" type="hidden" value="[% HTML.escape(db) %]">
+
+ [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]<br>
+
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
+
+</form>
diff --git a/templates/webpages/ct/list_names_bottom_de.html b/templates/webpages/ct/list_names_bottom_de.html
deleted file mode 100644 (file)
index 2d6625f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[% USE HTML %]<form method="post" action="ct.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
- <input name="db" type="hidden" value="[% HTML.escape(db) %]">
-
- [% IF IS_CUSTOMER %]Neuer Kunde[% ELSE %]Neuer Lieferant[% END %]<br>
-
- <input class="submit" type="submit" name="action" value="Erfassen">
-
-</form>
diff --git a/templates/webpages/ct/list_names_bottom_en.html b/templates/webpages/ct/list_names_bottom_en.html
deleted file mode 100644 (file)
index 84ae3e8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[% USE HTML %]<form method="post" action="ct.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
- <input name="db" type="hidden" value="[% HTML.escape(db) %]">
-
- [% IF IS_CUSTOMER %]New customer[% ELSE %]New vendor[% END %]<br>
-
- <input class="submit" type="submit" name="action" value="Add">
-
-</form>
diff --git a/templates/webpages/ct/list_names_bottom_master.html b/templates/webpages/ct/list_names_bottom_master.html
deleted file mode 100644 (file)
index f95a18c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[% USE HTML %]<form method="post" action="ct.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
- <input name="db" type="hidden" value="[% HTML.escape(db) %]">
-
- [% IF IS_CUSTOMER %]<translate>New customer</translate>[% ELSE %]<translate>New vendor</translate>[% END %]<br>
-
- <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
-
-</form>
diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
new file mode 100644 (file)
index 0000000..7469774
--- /dev/null
@@ -0,0 +1,166 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="fokus()">
+
+ <form method="post" action="ct.pl" name="Form">
+
+  <input type="hidden" name="db" value="[% HTML.escape(db) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table>
+   <tr>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</th>
+    <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
+    <td><input name="name" size="35"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
+    <td><input name="contact" size="35"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
+    <td><input name="email" size="35"></td>
+   </tr>
+   <tr>
+    <th align="right" nowrap>[% 'Contact person (surname)' | $T8 %]</th>
+    <td><input name="cp_name" size="35"></td>
+   </tr>
+   </tr>
+    <th align="right" nowrap>[% 'Billing/shipping address (street)' | $T8 %]</th>
+    <td><input name="addr_street" size="35"></td>
+   </tr>
+ <tr>
+    <th align="right" nowrap>[% 'Billing/shipping address (zipcode)' | $T8 %]</th>
+    <td><input name="addr_zipcode" size="35"></td>
+ </tr>
+   <tr>
+    <th align="right" nowrap>[% 'Billing/shipping address (city)' | $T8 %]</th>
+    <td><input name="addr_city" size="35"></td>
+   </tr>
+   [% IF SHOW_BUSINESS_TYPES %]
+   <tr>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
+    <td>
+     <select name="business_id"><option value=""></option>
+      [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+   [% END %]
+
+   [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+   <tr>
+    <td></td>
+    <td>
+     <input name="status" class="radio" type="radio" value="all" checked> [% 'All' | $T8 %]
+     <input name="status" class="radio" type="radio" value="orphaned"> [% 'Orphaned' | $T8 %]
+    </td>
+   </tr>
+
+   <tr>
+    <td></td>
+    <td><input name="obsolete" class="radio" type="radio" value="all"> [% 'All' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="Y"> [% 'Obsolete' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="N" checked> [% 'Not obsolete' | $T8 %]
+    </td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th>
+    <td>
+     <table border="0">
+      <tr>
+       <td>
+        <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
+        <label for="l_id">[% 'ID' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_[% db %]number">[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</label>
+       </td>
+       <td>
+        <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_name">[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</label>
+       </td>
+       <td>
+        <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_street">[% 'Street' | $T8 %]</label>
+       </td>
+      </tr>
+
+      <tr>
+       <td>
+        <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_contact">[% 'Contact' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_phone">[% 'Phone' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
+        <label for="l_fax">[% 'Fax' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_zipcode">[% 'Zipcode' | $T8 %]</label>
+       </td>
+      </tr>
+
+      <tr>
+       <td>
+        <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
+        <label for="l_taxnumber">[% 'Tax Number' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_email">[% 'E-mail' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
+        <label for="l_business">[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</label>
+       </td>
+       <td>
+        <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_city">[% 'City' | $T8 %]</label>
+      </td>
+      </tr>
+
+      <tr>
+       <td>
+        <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
+        <label for="l_invnumber">[% 'Invoices' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
+        <label for="l_ordnumber">[% IF IS_CUSTOMER %][% 'Sales Orders' | $T8 %][% ELSE %][% 'Purchase Orders' | $T8 %][% END %]</label>
+       </td>
+       <td>
+        <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
+        <label for="l_quonumber">[% IF IS_CUSTOMER %][% 'Quotations' | $T8 %][% ELSE %][% 'RFQs' | $T8 %][% END %]</label>
+       </td>
+       <td>
+       </td>
+      </tr>
+
+      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+
+     </table>
+    </td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="nextsub" value="list_names">
+
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ct/search_de.html b/templates/webpages/ct/search_de.html
deleted file mode 100644 (file)
index 0773478..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
- <form method="post" action="ct.pl" name="Form">
-
-  <input type="hidden" name="db" value="[% HTML.escape(db) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table>
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundennummer[% ELSE %]Lieferantennummer[% END %]</th>
-    <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
-    <td><input name="name" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Kontakt</th>
-    <td><input name="contact" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>eMail</th>
-    <td><input name="email" size="35"></td>
-   </tr>
-   <tr>
-    <th align="right" nowrap>Ansprechpartner (Nachname)</th>
-    <td><input name="cp_name" size="35"></td>
-   </tr>
-   </tr>
-    <th align="right" nowrap>Rechnungsadresse (Straße)</th>
-    <td><input name="addr_street" size="35"></td>
-   </tr>
- <tr>
-    <th align="right" nowrap>Rechnungsadresse (PLZ)</th>
-    <td><input name="addr_zipcode" size="35"></td>
- </tr>
-   <tr>
-    <th align="right" nowrap>Rechnungsadresse (Stadt)</th>
-    <td><input name="addr_city" size="35"></td>
-   </tr>
-   [% IF SHOW_BUSINESS_TYPES %]
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</th>
-    <td>
-     <select name="business_id"><option value=""></option>
-      [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-   [% END %]
-
-   [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-   <tr>
-    <td></td>
-    <td>
-     <input name="status" class="radio" type="radio" value="all" checked> Alle
-     <input name="status" class="radio" type="radio" value="orphaned"> Nie benutzt
-    </td>
-   </tr>
-
-   <tr>
-    <td></td>
-    <td><input name="obsolete" class="radio" type="radio" value="all"> Alle
-     <input name="obsolete" class="radio" type="radio" value="Y"> Ungültig
-     <input name="obsolete" class="radio" type="radio" value="N" checked> Gültig
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>In Bericht aufnehmen</th>
-    <td>
-     <table border="0">
-      <tr>
-       <td>
-        <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
-        <label for="l_id">Buchungsnummer</label>
-       </td>
-       <td>
-        <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_[% db %]number">[% IF IS_CUSTOMER %]Kundennummer[% ELSE %]Lieferantennummer[% END %]</label>
-       </td>
-       <td>
-        <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</label>
-       </td>
-       <td>
-        <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_street">Straße</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_contact">Kontakt</label>
-       </td>
-       <td>
-        <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_phone">Telefon</label>
-       </td>
-       <td>
-        <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
-        <label for="l_fax">Fax</label>
-       </td>
-       <td>
-        <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_zipcode">PLZ</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_taxnumber">Steuernummer</label>
-       </td>
-       <td>
-        <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_email">eMail</label>
-       </td>
-       <td>
-        <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
-        <label for="l_business">[% IF IS_CUSTOMER %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</label>
-       </td>
-       <td>
-        <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_city">Stadt</label>
-      </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_invnumber">Rechnungen</label>
-       </td>
-       <td>
-        <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_ordnumber">[% IF IS_CUSTOMER %]Aufträge[% ELSE %]Lieferantenaufträge[% END %]</label>
-       </td>
-       <td>
-        <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_quonumber">[% IF IS_CUSTOMER %]Angebote[% ELSE %]Preisanfragen[% END %]</label>
-       </td>
-       <td>
-       </td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="list_names">
-
-  <input type="submit" class="submit" name="action" value="Weiter">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ct/search_en.html b/templates/webpages/ct/search_en.html
deleted file mode 100644 (file)
index 7f5ab60..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
- <form method="post" action="ct.pl" name="Form">
-
-  <input type="hidden" name="db" value="[% HTML.escape(db) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table>
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Customer Number[% ELSE %]Vendor Number[% END %]</th>
-    <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Customer Name[%- ELSE %]Vendor Name[%- END %]</th>
-    <td><input name="name" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Contact</th>
-    <td><input name="contact" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>E-mail</th>
-    <td><input name="email" size="35"></td>
-   </tr>
-   <tr>
-    <th align="right" nowrap>Contact person (surname)</th>
-    <td><input name="cp_name" size="35"></td>
-   </tr>
-   </tr>
-    <th align="right" nowrap>Billing/shipping address (street)</th>
-    <td><input name="addr_street" size="35"></td>
-   </tr>
- <tr>
-    <th align="right" nowrap>Billing/shipping address (zipcode)</th>
-    <td><input name="addr_zipcode" size="35"></td>
- </tr>
-   <tr>
-    <th align="right" nowrap>Billing/shipping address (city)</th>
-    <td><input name="addr_city" size="35"></td>
-   </tr>
-   [% IF SHOW_BUSINESS_TYPES %]
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Customer type[% ELSE %]Vendor type[% END %]</th>
-    <td>
-     <select name="business_id"><option value=""></option>
-      [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-   [% END %]
-
-   [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-   <tr>
-    <td></td>
-    <td>
-     <input name="status" class="radio" type="radio" value="all" checked> All
-     <input name="status" class="radio" type="radio" value="orphaned"> Orphaned
-    </td>
-   </tr>
-
-   <tr>
-    <td></td>
-    <td><input name="obsolete" class="radio" type="radio" value="all"> All
-     <input name="obsolete" class="radio" type="radio" value="Y"> Obsolete
-     <input name="obsolete" class="radio" type="radio" value="N" checked> Not obsolete
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Include in Report</th>
-    <td>
-     <table border="0">
-      <tr>
-       <td>
-        <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
-        <label for="l_id">ID</label>
-       </td>
-       <td>
-        <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_[% db %]number">[% IF IS_CUSTOMER %]Customer Number[% ELSE %]Vendor Number[% END %]</label>
-       </td>
-       <td>
-        <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">[% IF IS_CUSTOMER %]Customer Name[%- ELSE %]Vendor Name[%- END %]</label>
-       </td>
-       <td>
-        <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_street">Street</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_contact">Contact</label>
-       </td>
-       <td>
-        <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_phone">Phone</label>
-       </td>
-       <td>
-        <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
-        <label for="l_fax">Fax</label>
-       </td>
-       <td>
-        <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_zipcode">Zipcode</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_taxnumber">Tax Number</label>
-       </td>
-       <td>
-        <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_email">E-mail</label>
-       </td>
-       <td>
-        <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
-        <label for="l_business">[% IF IS_CUSTOMER %]Customer type[% ELSE %]Vendor type[% END %]</label>
-       </td>
-       <td>
-        <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_city">City</label>
-      </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_invnumber">Invoices</label>
-       </td>
-       <td>
-        <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_ordnumber">[% IF IS_CUSTOMER %]Sales Orders[% ELSE %]Purchase Orders[% END %]</label>
-       </td>
-       <td>
-        <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_quonumber">[% IF IS_CUSTOMER %]Quotations[% ELSE %]RFQs[% END %]</label>
-       </td>
-       <td>
-       </td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="list_names">
-
-  <input type="submit" class="submit" name="action" value="Continue">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ct/search_master.html b/templates/webpages/ct/search_master.html
deleted file mode 100644 (file)
index b54a864..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
- <form method="post" action="ct.pl" name="Form">
-
-  <input type="hidden" name="db" value="[% HTML.escape(db) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table>
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Number</translate>[% ELSE %]<translate>Vendor Number</translate>[% END %]</th>
-    <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
-    <td><input name="name" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Contact</translate></th>
-    <td><input name="contact" size="35"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>E-mail</translate></th>
-    <td><input name="email" size="35"></td>
-   </tr>
-   <tr>
-    <th align="right" nowrap><translate>Contact person (surname)</translate></th>
-    <td><input name="cp_name" size="35"></td>
-   </tr>
-   </tr>
-    <th align="right" nowrap><translate>Billing/shipping address (street)</translate></th>
-    <td><input name="addr_street" size="35"></td>
-   </tr>
- <tr>
-    <th align="right" nowrap><translate>Billing/shipping address (zipcode)</translate></th>
-    <td><input name="addr_zipcode" size="35"></td>
- </tr>
-   <tr>
-    <th align="right" nowrap><translate>Billing/shipping address (city)</translate></th>
-    <td><input name="addr_city" size="35"></td>
-   </tr>
-   [% IF SHOW_BUSINESS_TYPES %]
-   <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</th>
-    <td>
-     <select name="business_id"><option value=""></option>
-      [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-   [% END %]
-
-   [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-   <tr>
-    <td></td>
-    <td>
-     <input name="status" class="radio" type="radio" value="all" checked> <translate>All</translate>
-     <input name="status" class="radio" type="radio" value="orphaned"> <translate>Orphaned</translate>
-    </td>
-   </tr>
-
-   <tr>
-    <td></td>
-    <td><input name="obsolete" class="radio" type="radio" value="all"> <translate>All</translate>
-     <input name="obsolete" class="radio" type="radio" value="Y"> <translate>Obsolete</translate>
-     <input name="obsolete" class="radio" type="radio" value="N" checked> <translate>Not obsolete</translate>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Include in Report</translate></th>
-    <td>
-     <table border="0">
-      <tr>
-       <td>
-        <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
-        <label for="l_id"><translate>ID</translate></label>
-       </td>
-       <td>
-        <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_[% db %]number">[% IF IS_CUSTOMER %]<translate>Customer Number</translate>[% ELSE %]<translate>Vendor Number</translate>[% END %]</label>
-       </td>
-       <td>
-        <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</label>
-       </td>
-       <td>
-        <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_street"><translate>Street</translate></label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_contact"><translate>Contact</translate></label>
-       </td>
-       <td>
-        <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_phone"><translate>Phone</translate></label>
-       </td>
-       <td>
-        <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
-        <label for="l_fax"><translate>Fax</translate></label>
-       </td>
-       <td>
-        <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_zipcode"><translate>Zipcode</translate></label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_taxnumber"><translate>Tax Number</translate></label>
-       </td>
-       <td>
-        <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_email"><translate>E-mail</translate></label>
-       </td>
-       <td>
-        <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
-        <label for="l_business">[% IF IS_CUSTOMER %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</label>
-       </td>
-       <td>
-        <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_city"><translate>City</translate></label>
-      </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_invnumber"><translate>Invoices</translate></label>
-       </td>
-       <td>
-        <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_ordnumber">[% IF IS_CUSTOMER %]<translate>Sales Orders</translate>[% ELSE %]<translate>Purchase Orders</translate>[% END %]</label>
-       </td>
-       <td>
-        <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_quonumber">[% IF IS_CUSTOMER %]<translate>Quotations</translate>[% ELSE %]<translate>RFQs</translate>[% END %]</label>
-       </td>
-       <td>
-       </td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="list_names">
-
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/datev/net_gross_difference.html b/templates/webpages/datev/net_gross_difference.html
new file mode 100644 (file)
index 0000000..98e963e
--- /dev/null
@@ -0,0 +1,27 @@
+[% USE HTML %][% USE LxERP %]
+
+<p>
+ <b>Hinweis:</b>
+</p>
+
+<p>
+ Lx-Office speichert Buchungsdaten als aggregierte Nettowerte.
+
+ Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit
+ Bruttowerten.
+
+ Es ist deshalb technisch nicht immer möglich, aus den vorhandenen
+ aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für
+ einen Beleg betrachtet die von Lx-Office angezeigten und die in den
+ DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
+
+ Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
+ Lx-Office ist größer als Brutto DATEV und umgekehrt), werden aber von
+ den Steuerbehörden anstandslos akzeptiert.
+</p>
+
+<p>
+ In dem gerade durchgeführten Export gab es [% net_gross_differences.size %]
+ solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
+ [% LxERP.format_amount(sum_net_gross_differences, 2) %].
+</p>
diff --git a/templates/webpages/datev/net_gross_difference_de.html b/templates/webpages/datev/net_gross_difference_de.html
deleted file mode 100644 (file)
index 98e963e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<p>
- <b>Hinweis:</b>
-</p>
-
-<p>
- Lx-Office speichert Buchungsdaten als aggregierte Nettowerte.
-
- Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit
- Bruttowerten.
-
- Es ist deshalb technisch nicht immer möglich, aus den vorhandenen
- aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für
- einen Beleg betrachtet die von Lx-Office angezeigten und die in den
- DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
-
- Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
- Lx-Office ist größer als Brutto DATEV und umgekehrt), werden aber von
- den Steuerbehörden anstandslos akzeptiert.
-</p>
-
-<p>
- In dem gerade durchgeführten Export gab es [% net_gross_differences.size %]
- solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
- [% LxERP.format_amount(sum_net_gross_differences, 2) %].
-</p>
diff --git a/templates/webpages/datev/net_gross_difference_en.html b/templates/webpages/datev/net_gross_difference_en.html
deleted file mode 100644 (file)
index 98e963e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<p>
- <b>Hinweis:</b>
-</p>
-
-<p>
- Lx-Office speichert Buchungsdaten als aggregierte Nettowerte.
-
- Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit
- Bruttowerten.
-
- Es ist deshalb technisch nicht immer möglich, aus den vorhandenen
- aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für
- einen Beleg betrachtet die von Lx-Office angezeigten und die in den
- DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
-
- Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
- Lx-Office ist größer als Brutto DATEV und umgekehrt), werden aber von
- den Steuerbehörden anstandslos akzeptiert.
-</p>
-
-<p>
- In dem gerade durchgeführten Export gab es [% net_gross_differences.size %]
- solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
- [% LxERP.format_amount(sum_net_gross_differences, 2) %].
-</p>
diff --git a/templates/webpages/datev/net_gross_difference_master.html b/templates/webpages/datev/net_gross_difference_master.html
deleted file mode 100644 (file)
index 98e963e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<p>
- <b>Hinweis:</b>
-</p>
-
-<p>
- Lx-Office speichert Buchungsdaten als aggregierte Nettowerte.
-
- Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit
- Bruttowerten.
-
- Es ist deshalb technisch nicht immer möglich, aus den vorhandenen
- aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für
- einen Beleg betrachtet die von Lx-Office angezeigten und die in den
- DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
-
- Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
- Lx-Office ist größer als Brutto DATEV und umgekehrt), werden aber von
- den Steuerbehörden anstandslos akzeptiert.
-</p>
-
-<p>
- In dem gerade durchgeführten Export gab es [% net_gross_differences.size %]
- solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
- [% LxERP.format_amount(sum_net_gross_differences, 2) %].
-</p>
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
new file mode 100644 (file)
index 0000000..c4a3dc6
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
+
+<form action="[% script %]" method="POST">
+
+<p>[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
+
+<input type="hidden" name="account_exists" value="1">
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html
deleted file mode 100644 (file)
index 7c2ecd0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<div class="listtop">Update SKR04: neues Steuerkonto 3804 (19%) für innergemeinschaftlichen Erwerb</div>
-
-<form action="[% script %]" method="POST">
-
-<p>Das Konto 3804 existiert schon, das Update wird übersprungen.</p>
-<p>Bitte lesen Sie die Dateidoc/skr04-update-3804/skr04_3804_hinzufuegen.html.
-
-<input type="hidden" name="account_exists" value="1">
-<input type="submit" value="Weiter">
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_en.html
deleted file mode 100644 (file)
index e44f70d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<div class="listtop">Update SKR04: new tax account 3804 (19%)</div>
-
-<form action="[% script %]" method="POST">
-
-<p>The account 3804 already exists, the update will be skipped.</p>
-<p>Please read the filedoc/skr04-update-3804/skr04_3804_hinzufuegen.html.
-
-<input type="hidden" name="account_exists" value="1">
-<input type="submit" value="Continue">
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
deleted file mode 100644 (file)
index ba36b3e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Update SKR04: new tax account 3804 (19%)</translate></div>
-
-<form action="[% script %]" method="POST">
-
-<p><translate>The account 3804 already exists, the update will be skipped.</translate></p>
-<p><translate>Please read the file</translate>doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
-
-<input type="hidden" name="account_exists" value="1">
-<input type="submit" value="<translate>Continue</translate>">
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update.html b/templates/webpages/dbupgrade/SKR04_3804_update.html
new file mode 100644 (file)
index 0000000..3850027
--- /dev/null
@@ -0,0 +1,13 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
+
+<form action="[% script %]" method="POST">
+
+<p>[% 'There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.' | $T8 %]</p>
+<p>[% 'The account 3804 will not be added automatically.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
+
+<input type="hidden" name="bookings_exist" value="1">
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_de.html b/templates/webpages/dbupgrade/SKR04_3804_update_de.html
deleted file mode 100644 (file)
index 2641022..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<div class="listtop">Update SKR04: neues Steuerkonto 3804 (19%) für innergemeinschaftlichen Erwerb</div>
-
-<form action="[% script %]" method="POST">
-
-<p>Das Konto 3803 wurde nach dem 01.01.2007 bebucht. Falls Sie dieses Konto nicht manuell auf 19% gestellt haben sind die Buchungen wahrscheinlich mit falscher Umsatzsteuer gebucht worden.</p>
-<p>Das Konto 3804 wird nicht automatisch hinzugefügt.</p>
-<p>Bitte lesen Sie die Dateidoc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
-
-<input type="hidden" name="bookings_exist" value="1">
-<input type="submit" value="Weiter">
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_en.html b/templates/webpages/dbupgrade/SKR04_3804_update_en.html
deleted file mode 100644 (file)
index 9b3f9ff..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<div class="listtop">Update SKR04: new tax account 3804 (19%)</div>
-
-<form action="[% script %]" method="POST">
-
-<p>There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.</p>
-<p>The account 3804 will not be added automatically.</p>
-<p>Please read the filedoc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
-
-<input type="hidden" name="bookings_exist" value="1">
-<input type="submit" value="Continue">
-
-
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_master.html b/templates/webpages/dbupgrade/SKR04_3804_update_master.html
deleted file mode 100644 (file)
index b706a83..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Update SKR04: new tax account 3804 (19%)</translate></div>
-
-<form action="[% script %]" method="POST">
-
-<p><translate>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.</translate></p>
-<p><translate>The account 3804 will not be added automatically.</translate></p>
-<p><translate>Please read the file</translate>doc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
-
-<input type="hidden" name="bookings_exist" value="1">
-<input type="submit" value="<translate>Continue</translate>">
-
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html
new file mode 100644 (file)
index 0000000..0f0ce61
--- /dev/null
@@ -0,0 +1,146 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="type" value="parts">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
+
+ <p>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  <br>
+  <ul>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    <li>
+     [% 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 %]
+    </li>
+   [% END %]
+  </ul>
+ </p>
+
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">[% LxERP.t8('New Buchungsgruppe #1', loop.count) | html %]</div>
+
+  <table>
+   <tr>
+    <td>[% 'Description' | $T8 %]:</td>
+    <td><input name="description_[% loop.count %]"></td>
+   </tr>
+
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
+    <tr>
+     <td>[% 'Inventory' | $T8 %]:</td>
+     <td>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+   [% END %]
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
+    <td>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_0_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+  </table>
+
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
+
+  <hr>
+ [% END %]
+
+ <input type="submit" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
deleted file mode 100644 (file)
index bb3f4cc..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existierende Buchungsgruppen</div>
-
- <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Beschreibung:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventar:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Erl&ouml;skonto Inand:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_0_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto Ausland:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" name="dummy" value="Buchungsgruppe erfassen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html
new file mode 100644 (file)
index 0000000..226d645
--- /dev/null
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
+
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html
deleted file mode 100644 (file)
index 088d233..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
-
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_en.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_en.html
deleted file mode 100644 (file)
index 469c3ec..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Step 3 of 3: Assemblies</div>
-
-<p>There is nothing to do in this step.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
deleted file mode 100644 (file)
index 26af74e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
-
-<p><translate>There is nothing to do in this step.</translate></p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_en.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_en.html
deleted file mode 100644 (file)
index 19a0867..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 3 of 3: Assemblies</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existing Buchungsgruppen</div>
-
- <p>
-  The following Buchungsgruppen have already been created:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventory: [% row.inventory_accno %];
-
-     Income accno/Expense accno
-     National: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Income accno/Expense accno
-     EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Income accno/Expense accno
-     EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Income accno/Expense accno
-     International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">New Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Description:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventory:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Income accno National:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU with VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_0_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU with VAT ID:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU with VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU without VAT ID:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU without VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno International:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno International:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" name="dummy" value="Create Buchungsgruppen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
deleted file mode 100644 (file)
index f9c6329..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
-
- <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
-
-  <table>
-   <tr>
-    <td><translate>Description</translate>:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td><translate>Inventory</translate>:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_0_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer.html b/templates/webpages/dbupgrade/buchungsgruppen_footer.html
new file mode 100644 (file)
index 0000000..0e5f94f
--- /dev/null
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Update complete' | $T8 %]</div>
+
+<p>[% 'The database upgrade for the introduction of Buchungsgruppen is now complete.' | $T8 %]</p>
+
+<hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html
deleted file mode 100644 (file)
index 7505829..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="listtop">Update beendet.</div>
-
-<p>Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.</p>
-
-<hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_en.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_en.html
deleted file mode 100644 (file)
index dcbddc8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="listtop">Update complete</div>
-
-<p>The database upgrade for the introduction of Buchungsgruppen is now complete.</p>
-
-<hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
deleted file mode 100644 (file)
index 2393a3c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="listtop"><translate>Update complete</translate></div>
-
-<p><translate>The database upgrade for the introduction of Buchungsgruppen is now complete.</translate></p>
-
-<hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header.html b/templates/webpages/dbupgrade/buchungsgruppen_header.html
new file mode 100644 (file)
index 0000000..5e962c9
--- /dev/null
@@ -0,0 +1,19 @@
+[%- USE T8 %]
+<hr>
+
+<div class="listtop">[% 'Introduction of Buchungsgruppen' | $T8 %]</div>
+
+<p>
+ [%- '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 %]
+</p>
+
+<p>
+ [% '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 %]
+</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_de.html b/templates/webpages/dbupgrade/buchungsgruppen_header_de.html
deleted file mode 100644 (file)
index 65bc428..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<hr>
-
-<div class="listtop">Einf&uuml;hrung von Buchungsgruppen</div>
-
-<p>
- Vor Lx-Office 2.4.0 musste der Benutzer die Konten bei jeder Ware und jeder Dienstleistung einzeln ausw&auml;hlen.
- Lx-Office 2.4.0 f&uuml;hrt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.
- Es gibt vier Steuerzonen.
- Eine Buchungsgruppe besteht aus einem deskriptiven Namen, den Erl&ouml;s- und Aufwandskonten f&uuml;r diese vier Steuerzonen sowie aus einem Inventarkonto.
- Der Benutzer muss nun f&uuml;r jeden Artikel nur noch die Buchungsgruppe anstelle der drei einzelnen Konten ausw&auml;hlen.
- Deswegen muss man den gleichen Artikel nicht mehr mehrmals anlegen, wenn er in verschiedenen Steuerzonen gehandelt werden soll.
-</p>
-
-<p>
- Dieses Upgradescript versucht, bei allen bestehenden Artikeln neu erstellte Buchungsgruppen zuzuordnen.
- Es ist m&ouml;glich, dies f&uuml;r einige, aber nicht f&uuml;r alle Buchungsgruppen automatisch zu erledigen.
- Sie m&uuml;ssen neue Buchungsgruppen f&uuml;r alle Kombinationen aus Inventar-, Erl&ouml;s- und Aufwandskonto, die bereits benutzt wurden.
-</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_en.html b/templates/webpages/dbupgrade/buchungsgruppen_header_en.html
deleted file mode 100644 (file)
index 0f1f9ec..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<hr>
-
-<div class="listtop">Introduction of Buchungsgruppen</div>
-
-<p>
- Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.
- Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.
- There are four tax zones.
- 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.
- Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.
- Therefore there's no need to create the same article more than once if it is sold or bought in/from another tax zone.
-</p>
-
-<p>
- This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.
- It is possible to do this automatically for some Buchungsgruppen, but not for all.
- You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.
-</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_master.html b/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
deleted file mode 100644 (file)
index abb9015..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<hr>
-
-<div class="listtop"><translate>Introduction of Buchungsgruppen</translate></div>
-
-<p>
- <translate>Prior to Lx-Office v2.4.0 the user had to chose the accounts
-  for each part and service.</translate>
- <translate>Lx-Office 2.4.0 introduces two new concepts: tax zones and
-  Buchungsgruppen.</translate>
- <translate>There are four tax zones.</translate>
- <translate>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.</translate>
- <translate>Now the user must select a single Buchungsgruppe for each
-  part instead of three distinct accounts.</translate>
- <translate>Therefore there's no need to create the same article more
-  than once if it is sold or bought in/from another tax
-  zone.</translate>
-</p>
-
-<p>
- <translate>This upgrade script tries to map all existing parts in the
-  database to the newly created Buchungsgruppen.</translate>
- <translate>It is possible to do this automatically for some
-  Buchungsgruppen, but not for all.</translate>
- <translate>You have to create new Buchungsgruppen for all the
-  combinations of inventory, income and expense accounts that have
-  been used already.</translate>
-</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts.html b/templates/webpages/dbupgrade/buchungsgruppen_parts.html
new file mode 100644 (file)
index 0000000..765a51b
--- /dev/null
@@ -0,0 +1,144 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="type" value="parts">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
+
+ <p>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  <br>
+  <ul>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    <li>
+     [% 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 %]
+    </li>
+   [% END %]
+  </ul>
+ </p>
+
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">[% LxERP.t8('New Buchungsgruppe #1', loop.count) | html %]</div>
+
+  <table>
+   <tr>
+    <td>[% 'Description' | $T8 %]:</td>
+    <td><input name="description_[% loop.count %]"></td>
+   </tr>
+
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
+    <tr>
+     <td>[% 'Inventory' | $T8 %]:</td>
+     <td>
+      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
+      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
+     </td>
+    </tr>
+   [% END %]
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
+    <td>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
+    <td>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+  </table>
+
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
+
+  <hr>
+ [% END %]
+
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
deleted file mode 100644 (file)
index 9401f61..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existierende Buchungsgruppen</div>
-
- <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Beschreibung:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventar:</td>
-     <td>
-      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
-      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Erl&ouml;skonto Inand:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto Inand:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto Ausland:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done.html
new file mode 100644 (file)
index 0000000..d93cb06
--- /dev/null
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
+
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html
deleted file mode 100644 (file)
index e2f26c8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
-
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_en.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_en.html
deleted file mode 100644 (file)
index 800c173..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Step 1 of 3: Parts</div>
-
-<p>There is nothing to do in this step.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
deleted file mode 100644 (file)
index 0c4b178..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
-
-<p><translate>There is nothing to do in this step.</translate></p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_en.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_en.html
deleted file mode 100644 (file)
index e83f283..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 1 of 3: Parts</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existing Buchungsgruppen</div>
-
- <p>
-  The following Buchungsgruppen have already been created:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventory: [% row.inventory_accno %];
-
-     Income accno/Expense accno
-     National: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Income accno/Expense accno
-     EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Income accno/Expense accno
-     EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Income accno/Expense accno
-     International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">New Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Description:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventory:</td>
-     <td>
-      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
-      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Income accno National:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno National:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU with VAT ID:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU with VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU without VAT ID:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU without VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno International:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno International:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Create Buchungsgruppen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
deleted file mode 100644 (file)
index 3f954b9..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
-
- <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
-
-  <table>
-   <tr>
-    <td><translate>Description</translate>:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td><translate>Inventory</translate>:</td>
-     <td>
-      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
-      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>National</translate>:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services.html b/templates/webpages/dbupgrade/buchungsgruppen_services.html
new file mode 100644 (file)
index 0000000..101edab
--- /dev/null
@@ -0,0 +1,145 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="type" value="parts">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
+
+ <p>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
+  <br>
+  <ul>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
+    <li>
+     [% 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 %]
+    </li>
+   [% END %]
+  </ul>
+ </p>
+
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">[% LxERP.t8('New Buchungsgruppe #1', loop.count) | html %]</div>
+
+  <table>
+   <tr>
+    <td>[% 'Description' | $T8 %]:</td>
+    <td><input name="description_[% loop.count %]"></td>
+   </tr>
+
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
+    <tr>
+     <td>[% 'Inventory' | $T8 %]:</td>
+     <td>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+   [% END %]
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
+    <td>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
+    <td>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
+    <td>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
+     </select>
+    </td>
+   </tr>
+  </table>
+
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
+
+  <hr>
+ [% END %]
+
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
deleted file mode 100644 (file)
index e6493f3..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existierende Buchungsgruppen</div>
-
- <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Beschreibung:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventar:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Erl&ouml;skonto Inand:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto Inand:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Aufwandskonto Ausland:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done.html
new file mode 100644 (file)
index 0000000..a3d4f4f
--- /dev/null
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
+
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html
deleted file mode 100644 (file)
index b2df9bd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
-
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_en.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_en.html
deleted file mode 100644 (file)
index b9b1d4b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Step 2 of 3: Services</div>
-
-<p>There is nothing to do in this step.</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
deleted file mode 100644 (file)
index c55db13..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
-
-<p><translate>There is nothing to do in this step.</translate></p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_en.html b/templates/webpages/dbupgrade/buchungsgruppen_services_en.html
deleted file mode 100644 (file)
index e3cbbdd..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 2 of 3: Services</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Existing Buchungsgruppen</div>
-
- <p>
-  The following Buchungsgruppen have already been created:
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     Inventory: [% row.inventory_accno %];
-
-     Income accno/Expense accno
-     National: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     Income accno/Expense accno
-     EU with VAT ID: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     Income accno/Expense accno
-     EU without VAT ID: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     Income accno/Expense accno
-     International: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading">New Buchungsgruppe [% loop.count %]</div>
-
-  <table>
-   <tr>
-    <td>Description:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td>Inventory:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td>Income accno National:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno National:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU with VAT ID:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU with VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno EU without VAT ID:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno EU without VAT ID:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Income accno International:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td>Expense accno International:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Create Buchungsgruppen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
deleted file mode 100644 (file)
index bdf2180..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="type" value="parts">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
-
- <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
-  <br>
-  <ul>
-   [% FOREACH row = BUCHUNGSGRUPPEN %]
-    <li>
-     [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
-
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
-    </li>
-   [% END %]
-  </ul>
- </p>
-
- [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
-
-  <table>
-   <tr>
-    <td><translate>Description</translate>:</td>
-    <td><input name="description_[% loop.count %]"></td>
-   </tr>
-
-   [% IF row.eur %]
-    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
-    [% ELSE %]
-    <tr>
-     <td><translate>Inventory</translate>:</td>
-     <td>
-      <select name="inventory_accno_id_[% loop.count %]">
-       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
-    <td>
-     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
-     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>National</translate>:</td>
-    <td>
-     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
-     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_1_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="income_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
-    <td>
-     <select name="expense_accno_id_2_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="income_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
-    <td>
-     <select name="expense_accno_id_3_[% loop.count %]">
-      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  [% IF loop.last %]
-   <input type="hidden" name="rowcount" value="[% loop.count %]">
-  [% END %]
-
-  <hr>
- [% END %]
-
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/coa_guess.html b/templates/webpages/dbupgrade/coa_guess.html
new file mode 100644 (file)
index 0000000..cec2c57
--- /dev/null
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Select the chart of accounts in use' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <p>
+  [% 'Please select the chart of accounts this installation is using from the list below.' | $T8 %]
+ </p>
+
+ <p>
+  [% 'Chart of accounts' | $T8 %]:
+  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
+ </p>
+
+ <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="[% 'Continue' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/coa_guess_de.html b/templates/webpages/dbupgrade/coa_guess_de.html
deleted file mode 100644 (file)
index 0e53064..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<div class="listtop">Benutzten Kontenrahmen ausw&auml;hlen</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  Bitte w&auml;hlen Sie den Kontenrahmen aus, der bei dieser Installation verwendet wird.
- </p>
-
- <p>
-  Kontenrahmen:
-  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
- </p>
-
- <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="Weiter">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/coa_guess_en.html b/templates/webpages/dbupgrade/coa_guess_en.html
deleted file mode 100644 (file)
index cea9e87..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<div class="listtop">Select the chart of accounts in use</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  Please select the chart of accounts this installation is using from the list below.
- </p>
-
- <p>
-  Chart of accounts:
-  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
- </p>
-
- <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="Continue">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html
deleted file mode 100644 (file)
index f310c0c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Select the chart of accounts in use</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  <translate>Please select the chart of accounts this installation
-   is using from the list below.</translate>
- </p>
-
- <p>
-  <translate>Chart of accounts</translate>:
-  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
- </p>
-
- <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="<translate>Continue</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form.html b/templates/webpages/dbupgrade/cp_greeting_update_form.html
new file mode 100644 (file)
index 0000000..b4cb334
--- /dev/null
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'cp_greeting to cp_gender migration' | $T8 %]</div>
+
+
+<form action="[% script %]" method="POST">
+<br>
+<p> The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.</p>
+
+<p>During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.</p>
+
+During the conversion process:<br>
+1. All contact persons will have their gender set to "m" (male) as a default<br>
+2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)<br>
+
+<p>The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:</p>
+[% gender_table %]
+
+
+<p>Please enter your desired default greeting for men and women. To change the
+default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
+</p>
+
+<p>
+Greeting for men: [% default_greeting_text_male %] <br>
+Greeting for women: [% default_greeting_text_female %] <br>
+</p>
+
+<br><br>
+The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
+<br>
+[% title_table %]
+
+<input type=hidden name="do_migrate" value="1"> 
+<input type=submit VALUE="submit">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form_de.html b/templates/webpages/dbupgrade/cp_greeting_update_form_de.html
deleted file mode 100644 (file)
index 6cdc23d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<div class="listtop">Datenumwandlung von Titel nach Geschlecht (cp_greeting to cp_gender)</div>
-
-
-<form action="[% script %]" method="POST">
-<br>
-<p> The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.</p>
-
-<p>During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.</p>
-
-During the conversion process:<br>
-1. All contact persons will have their gender set to "m" (male) as a default<br>
-2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)<br>
-
-<p>The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:</p>
-[% gender_table %]
-
-
-<p>Please enter your desired default greeting for men and women. To change the
-default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
-</p>
-
-<p>
-Greeting for men: [% default_greeting_text_male %] <br>
-Greeting for women: [% default_greeting_text_female %] <br>
-</p>
-
-<br><br>
-The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
-<br>
-[% title_table %]
-
-<input type=hidden name="do_migrate" value="1"> 
-<input type=submit VALUE="submit">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form_en.html b/templates/webpages/dbupgrade/cp_greeting_update_form_en.html
deleted file mode 100644 (file)
index 02e7b97..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<div class="listtop">cp_greeting to cp_gender migration</div>
-
-
-<form action="[% script %]" method="POST">
-<br>
-<p> The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.</p>
-
-<p>During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.</p>
-
-During the conversion process:<br>
-1. All contact persons will have their gender set to "m" (male) as a default<br>
-2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)<br>
-
-<p>The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:</p>
-[% gender_table %]
-
-
-<p>Please enter your desired default greeting for men and women. To change the
-default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
-</p>
-
-<p>
-Greeting for men: [% default_greeting_text_male %] <br>
-Greeting for women: [% default_greeting_text_female %] <br>
-</p>
-
-<br><br>
-The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
-<br>
-[% title_table %]
-
-<input type=hidden name="do_migrate" value="1"> 
-<input type=submit VALUE="submit">
-
-</form>
-
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 (file)
index 42db009..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>cp_greeting to cp_gender migration</translate></div>
-
-
-<form action="[% script %]" method="POST">
-<br>
-<p> The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.</p>
-
-<p>During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.</p>
-
-During the conversion process:<br>
-1. All contact persons will have their gender set to "m" (male) as a default<br>
-2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)<br>
-
-<p>The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:</p>
-[% gender_table %]
-
-
-<p>Please enter your desired default greeting for men and women. To change the
-default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
-</p>
-
-<p>
-Greeting for men: [% default_greeting_text_male %] <br>
-Greeting for women: [% default_greeting_text_female %] <br>
-</p>
-
-<br><br>
-The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
-<br>
-[% title_table %]
-
-<input type=hidden name="do_migrate" value="1"> 
-<input type=submit VALUE="submit">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/error.html b/templates/webpages/dbupgrade/error.html
new file mode 100644 (file)
index 0000000..4bcd9b0
--- /dev/null
@@ -0,0 +1,9 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<p>[% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
+ <br>
+ [% error %]
+ <br>
+ [% 'All changes in that file have been reverted.' | $T8 %]
+</p>
diff --git a/templates/webpages/dbupgrade/error_de.html b/templates/webpages/dbupgrade/error_de.html
deleted file mode 100644 (file)
index ee37ea5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[% USE HTML %]<p>Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:
- <br>
- [% error %]
- <br>
- Alle &Auml;nderungen in dieser Datei wurden r&uuml;ckg&auml;ngig gemacht.
-</p>
diff --git a/templates/webpages/dbupgrade/error_en.html b/templates/webpages/dbupgrade/error_en.html
deleted file mode 100644 (file)
index 9060970..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[% USE HTML %]<p>The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:
- <br>
- [% error %]
- <br>
- All changes in that file have been reverted.
-</p>
diff --git a/templates/webpages/dbupgrade/error_master.html b/templates/webpages/dbupgrade/error_master.html
deleted file mode 100644 (file)
index ca99d40..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[% USE HTML %]<p><translate>The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:</translate>
- <br>
- [% error %]
- <br>
- <translate>All changes in that file have been reverted.</translate>
-</p>
diff --git a/templates/webpages/dbupgrade/footer.html b/templates/webpages/dbupgrade/footer.html
new file mode 100644 (file)
index 0000000..e4c312a
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]<p>[% '...done' | $T8 %]</p>
+
+<form action="[% menufile %]">
+
+ <input type="hidden" name="action" value="display">
+
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html
deleted file mode 100644 (file)
index a92d486..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<p>...fertig</p>
-
-<form action="[% menufile %]">
-
- <input type="hidden" name="action" value="display">
-
- <p><input type="submit" value="Weiter"></p>
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/dbupgrade/footer_en.html b/templates/webpages/dbupgrade/footer_en.html
deleted file mode 100644 (file)
index 6adf42b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<p>...done</p>
-
-<form action="[% menufile %]">
-
- <input type="hidden" name="action" value="display">
-
- <p><input type="submit" value="Continue"></p>
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html
deleted file mode 100644 (file)
index dda72dd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<p><translate>...done</translate></p>
-
-<form action="[% menufile %]">
-
- <input type="hidden" name="action" value="display">
-
- <p><input type="submit" value="<translate>Continue</translate>"></p>
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/dbupgrade/header.html b/templates/webpages/dbupgrade/header.html
new file mode 100644 (file)
index 0000000..09d840b
--- /dev/null
@@ -0,0 +1,8 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <table width="100%">
+  <tr>
+   <td class="listtop">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</td>
+  </tr>
+ </table>
diff --git a/templates/webpages/dbupgrade/header_de.html b/templates/webpages/dbupgrade/header_de.html
deleted file mode 100644 (file)
index 112eea4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[% USE HTML %]<body>
-
- <table width="100%">
-  <tr>
-   <td class="listtop">Datenbankaktualisierung ([% HTML.escape(dbname) %])</td>
-  </tr>
- </table>
diff --git a/templates/webpages/dbupgrade/header_en.html b/templates/webpages/dbupgrade/header_en.html
deleted file mode 100644 (file)
index df173ab..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[% USE HTML %]<body>
-
- <table width="100%">
-  <tr>
-   <td class="listtop">Dataset upgrade ([% HTML.escape(dbname) %])</td>
-  </tr>
- </table>
diff --git a/templates/webpages/dbupgrade/header_master.html b/templates/webpages/dbupgrade/header_master.html
deleted file mode 100644 (file)
index 77dc972..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[% USE HTML %]<body>
-
- <table width="100%">
-  <tr>
-   <td class="listtop"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</td>
-  </tr>
- </table>
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa.html
new file mode 100644 (file)
index 0000000..0a31cbc
--- /dev/null
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Unknown chart of accounts' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <p>
+  [% 'Note' | $T8 %]:
+  [% LxERP.t8('This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.', coa) | html %]
+ </p>
+
+ <hr>
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
deleted file mode 100644 (file)
index dcea40e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[% USE HTML %]<div class="listtop">Unbekannter Kontenrahmen</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  Hinweis:
-  Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;[% HTML.escape(coa) %]&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.
- </p>
-
- <hr>
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_en.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_en.html
deleted file mode 100644 (file)
index bc7d2e4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[% USE HTML %]<div class="listtop">Unknown chart of accounts</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  Note:
-  This installation uses an unknown chart of accounts (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade cannot create standard buchungsgruppen automatically.
- </p>
-
- <hr>
-
-</form>
-
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 (file)
index 7e29a03..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Unknown chart of accounts</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <p>
-  <translate>Note</translate>:
-  <translate>This installation uses an unknown chart of accounts
-   (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade
-   cannot create standard buchungsgruppen automatically.</translate>
- </p>
-
- <hr>
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_error.html b/templates/webpages/dbupgrade/units_error.html
new file mode 100644 (file)
index 0000000..d7019cb
--- /dev/null
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+[% USE HTML %]<p><b>[% 'Error' | $T8 %]:</b> [% message %]</p>
+
+<form>
+<input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+</form>
diff --git a/templates/webpages/dbupgrade/units_error_de.html b/templates/webpages/dbupgrade/units_error_de.html
deleted file mode 100644 (file)
index aa3f946..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %]<p><b>Fehler:</b> [% message %]</p>
-
-<form>
-<input type="button" onclick="history.back()" value="Zurück">
-</form>
diff --git a/templates/webpages/dbupgrade/units_error_en.html b/templates/webpages/dbupgrade/units_error_en.html
deleted file mode 100644 (file)
index f124b1c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %]<p><b>Error:</b> [% message %]</p>
-
-<form>
-<input type="button" onclick="history.back()" value="Back">
-</form>
diff --git a/templates/webpages/dbupgrade/units_error_master.html b/templates/webpages/dbupgrade/units_error_master.html
deleted file mode 100644 (file)
index 53578e2..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %]<p><b><translate>Error</translate>:</b> [% message %]</p>
-
-<form>
-<input type="button" onclick="history.back()" value="<translate>Back</translate>">
-</form>
diff --git a/templates/webpages/dbupgrade/units_header.html b/templates/webpages/dbupgrade/units_header.html
new file mode 100644 (file)
index 0000000..ef977a1
--- /dev/null
@@ -0,0 +1,17 @@
+[%- USE T8 %]
+<hr>
+
+<div class="listtop">[% 'Introduction of units' | $T8 %]</div>
+
+<p>
+ [% '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 %]
+</p>
+
+<p>
+ [% '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 %]
+</p>
diff --git a/templates/webpages/dbupgrade/units_header_de.html b/templates/webpages/dbupgrade/units_header_de.html
deleted file mode 100644 (file)
index 7c7dacc..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<hr>
-
-<div class="listtop">Einf&uuml;hrung von Einheiten</div>
-
-<p>
- Vor Lx-Office 2.4.0 konnte der Benutzer bei Artikeln, Dienstleistungen und Rechnungen, Angeboten etc beliebige Einheiten angeben.
- In Lx-Office 2.4.0 muss der Administrator in den Systemeinstellungen eine Liste von verwendbaren Einheiten angeben.
- Diese Einheiten k&ouml;nnen auf anderen Einheiten basieren, sodass Lx-Office Preise umrechnen kann, wenn der Benutzer von einer Einheit zu einer anderen Wechselt.
-</p>
-
-<p>
- Dieses Update-Script versucht, alle bestehenden Einheiten automatisch in die neuen Einheiten umzuwandeln.
- Das ist f&uuml;r einige Einheiten automatisch m&ouml;glich, aber bei anderen muss der Benutzer die neue Einheit ausw&auml;hlen.
- Sie k&ouml;nnen nicht fortfahren, bis alle unbekannten Einheiten in neue Einheiten umgewandelt wurden.
- Sie k&ouml;nnen jetzt auch neue Einheiten anlegen.
-</p>
diff --git a/templates/webpages/dbupgrade/units_header_en.html b/templates/webpages/dbupgrade/units_header_en.html
deleted file mode 100644 (file)
index 5f2a568..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<hr>
-
-<div class="listtop">Introduction of units</div>
-
-<p>
- Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.
- In Lx-Office 2.4.0 the administrator has to enter a list of units in the administrative section.
- These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.
-</p>
-
-<p>
- This upgrade script tries to map all existing units in the database to the newly created units.
- It is possible to do this automatically for some units, but for others the user has to chose the new unit.
- You cannot continue until all unknown units have been mapped to known ones.
- You can also create new units now.
-</p>
diff --git a/templates/webpages/dbupgrade/units_header_master.html b/templates/webpages/dbupgrade/units_header_master.html
deleted file mode 100644 (file)
index 72ffd6d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<hr>
-
-<div class="listtop"><translate>Introduction of units</translate></div>
-
-<p>
- <translate>Prior to Lx-Office v2.4.0 the user could enter arbitrary
-  strings as units for parts, services and in invoices, sales quotations
-  etc.</translate>
- <translate>In Lx-Office 2.4.0 the administrator has to enter a list
-  of units in the administrative section.</translate>
- <translate>These units can be based on other units so that Lx-Office
-  can convert prices when the user switches from one unit to
-  another.</translate>
-</p>
-
-<p>
- <translate>This upgrade script tries to map all existing units in the
-  database to the newly created units.</translate>
- <translate>It is possible to do this automatically for some units,
-  but for others the user has to chose the new unit.</translate>
- <translate>You cannot continue until all unknown units have been
-  mapped to known ones.</translate>
- <translate>You can also create new units now.</translate>
-</p>
diff --git a/templates/webpages/dbupgrade/units_parts.html b/templates/webpages/dbupgrade/units_parts.html
new file mode 100644 (file)
index 0000000..99cfec1
--- /dev/null
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="unit_type" value="dimension">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
+
+ <p>
+  [%- '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 &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
+ </p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <hr>
+
+ <table>
+  <tr>
+   <th align="right">[% 'Unit' | $T8 %]</th>
+   <td><input name="new_name" size="20" maxlength="20"></td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
+   <td>
+    <select name="new_base_unit">
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
+    </select>
+   </td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Factor' | $T8 %]</th>
+   <td><input name="new_factor"></td>
+  </tr>
+ </table>
+
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
+
+ <hr>
+
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
+
+ <p>
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
+ </p>
+
+ <table>
+  <tr>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
+  </tr>
+
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
+    <td>
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+    </td>
+    <td>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
+     </select>
+    </td>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
+ </table>
+
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/units_parts_de.html b/templates/webpages/dbupgrade/units_parts_de.html
deleted file mode 100644 (file)
index 04d5d8e..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
-
- <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
- </p>
-
- <p>
-  Die folgenden Einheiten existieren bereits:
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right">Einheit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Basiseinheit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Faktor</th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Einheit hinzuf&uuml;gen">
-
- <hr>
-
- <div class="subsubheading">Neue Einheiten zuweisen</div>
-
- <p>
-  Die folgenden Einheiten sind unbekannt.
-  Sie m&uuml;ssen f&uuml;r jeden Artikel die neue Einheit ausw&auml;hlen.
- </p>
-
- <table>
-  <tr>
-   <th class="listheading">Aktuelle Einheit</th>
-   <th class="listheading">Neue Einheit</th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_parts_done.html b/templates/webpages/dbupgrade/units_parts_done.html
new file mode 100644 (file)
index 0000000..fcbf906
--- /dev/null
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
+
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_parts_done_de.html b/templates/webpages/dbupgrade/units_parts_done_de.html
deleted file mode 100644 (file)
index 3fb2784..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
-
-<p>Es wurden keine unbekannten Einheiten gefunden.</p>
diff --git a/templates/webpages/dbupgrade/units_parts_done_en.html b/templates/webpages/dbupgrade/units_parts_done_en.html
deleted file mode 100644 (file)
index 83b0ca0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Step 1 of 3: Parts</div>
-
-<p>No unknown units where found.</p>
diff --git a/templates/webpages/dbupgrade/units_parts_done_master.html b/templates/webpages/dbupgrade/units_parts_done_master.html
deleted file mode 100644 (file)
index 908a7a7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
-
-<p><translate>No unknown units where found.</translate></p>
diff --git a/templates/webpages/dbupgrade/units_parts_en.html b/templates/webpages/dbupgrade/units_parts_en.html
deleted file mode 100644 (file)
index a48ac92..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 1 of 3: Parts</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Add unit</div>
-
- <p>
-  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 &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.
- </p>
-
- <p>
-  The following units exist already:
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right">Unit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Base unit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Factor</th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Add unit">
-
- <hr>
-
- <div class="subsubheading">Assign new units</div>
-
- <p>
-  The following units are unknown.
-  You have to chose which unit to save for each of them.
- </p>
-
- <table>
-  <tr>
-   <th class="listheading">Current unit</th>
-   <th class="listheading">New unit</th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Assign units">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html
deleted file mode 100644 (file)
index ad06450..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading"><translate>Add unit</translate></div>
-
- <p>
-  <translate>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 &quot;smaller&quot; one. A
-   factor may not be less than 1. Therefore you may define
-   &quot;kg&quot; with the base unit &quot;g&quot; and a factor of
-   &quot;1&quot;, but not the other way round.</translate>
- </p>
-
- <p>
-  <translate>The following units exist already:</translate>
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right"><translate>Unit</translate></th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Base unit</translate></th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Factor</translate></th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="<translate>Add unit</translate>">
-
- <hr>
-
- <div class="subsubheading"><translate>Assign new units</translate></div>
-
- <p>
-  <translate>The following units are unknown.</translate>
-  <translate>You have to chose which unit to save for each of them.</translate>
- </p>
-
- <table>
-  <tr>
-   <th class="listheading"><translate>Current unit</translate></th>
-   <th class="listheading"><translate>New unit</translate></th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_services.html b/templates/webpages/dbupgrade/units_services.html
new file mode 100644 (file)
index 0000000..26b60e8
--- /dev/null
@@ -0,0 +1,81 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="unit_type" value="service">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
+
+ <p>
+  [%- '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 &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
+ </p>
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <hr>
+
+ <table>
+  <tr>
+   <th align="right">[% 'Unit' | $T8 %]</th>
+   <td><input name="new_name" size="20" maxlength="20"></td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
+   <td>
+    <select name="new_base_unit">
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
+    </select>
+   </td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Factor' | $T8 %]</th>
+   <td><input name="new_factor"></td>
+  </tr>
+ </table>
+
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
+
+ <hr>
+
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
+
+ <p>
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
+ </p>
+
+ <table>
+  <tr>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
+  </tr>
+
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
+    <td>
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+    </td>
+    <td>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
+     </select>
+    </td>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
+ </table>
+
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
+
+</form>
+
diff --git a/templates/webpages/dbupgrade/units_services_de.html b/templates/webpages/dbupgrade/units_services_de.html
deleted file mode 100644 (file)
index 0304c38..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="service">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
-
- <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
- </p>
-
- <p>
-  Die folgenden Einheiten existieren bereits:
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right">Einheit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Basiseinheit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Faktor</th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Einheit hinzuf&uuml;gen">
-
- <hr>
-
- <div class="subsubheading">Neue Einheiten zuweisen</div>
-
- <p>
-  Die folgenden Einheiten sind unbekannt.
-  Sie m&uuml;ssen f&uuml;r jeden Artikel die neue Einheit ausw&auml;hlen.
- </p>
-
- <table>
-  <tr>
-   <th class="listheading">Aktuelle Einheit</th>
-   <th class="listheading">Neue Einheit</th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_services_done.html b/templates/webpages/dbupgrade/units_services_done.html
new file mode 100644 (file)
index 0000000..7de3335
--- /dev/null
@@ -0,0 +1,4 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
+
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_services_done_de.html b/templates/webpages/dbupgrade/units_services_done_de.html
deleted file mode 100644 (file)
index fd671a0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
-
-<p>Es wurden keine unbekannten Einheiten gefunden.</p>
diff --git a/templates/webpages/dbupgrade/units_services_done_en.html b/templates/webpages/dbupgrade/units_services_done_en.html
deleted file mode 100644 (file)
index 500c21b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop">Step 2 of 3: Services</div>
-
-<p>No unknown units where found.</p>
diff --git a/templates/webpages/dbupgrade/units_services_done_master.html b/templates/webpages/dbupgrade/units_services_done_master.html
deleted file mode 100644 (file)
index 21aef14..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
-
-<p><translate>No unknown units where found.</translate></p>
diff --git a/templates/webpages/dbupgrade/units_services_en.html b/templates/webpages/dbupgrade/units_services_en.html
deleted file mode 100644 (file)
index dc57227..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 2 of 3: Services</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="service">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading">Add unit</div>
-
- <p>
-  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 &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.
- </p>
-
- <p>
-  The following units exist already:
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right">Unit</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">Base unit</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">Factor</th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Add unit">
-
- <hr>
-
- <div class="subsubheading">Assign new units</div>
-
- <p>
-  The following units are unknown.
-  You have to chose which unit to save for each of them.
- </p>
-
- <table>
-  <tr>
-   <th class="listheading">Current unit</th>
-   <th class="listheading">New unit</th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Assign units">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html
deleted file mode 100644 (file)
index 32ba81c..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="service">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- [% IF saved_message %]
-  <p>[% saved_message %]</p>
- [% END %]
-
- <div class="subsubheading"><translate>Add unit</translate></div>
-
- <p>
-  <translate>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 &quot;smaller&quot; one. A
-   factor may not be less than 1. Therefore you may define
-   &quot;kg&quot; with the base unit &quot;g&quot; and a factor of
-   &quot;1&quot;, but not the other way round.</translate>
- </p>
-
- <p>
-  <translate>The following units exist already:</translate>
-  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
- </p>
-
- <hr>
-
- <table>
-  <tr>
-   <th align="right"><translate>Unit</translate></th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Base unit</translate></th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right"><translate>Factor</translate></th>
-   <td><input name="new_factor"></td>
-  </tr>
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="<translate>Add unit</translate>">
-
- <hr>
-
- <div class="subsubheading"><translate>Assign new units</translate></div>
-
- <p>
-  <translate>The following units are unknown.</translate>
-  <translate>You have to chose which unit to save for each of them.</translate>
- </p>
-
- <table>
-  <tr>
-   <th class="listheading"><translate>Current unit</translate></th>
-   <th class="listheading"><translate>New unit</translate></th>
-  </tr>
-
-  [% FOREACH row = UNKNOWN_PART_UNITS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     [% HTML.escape(row.name) %]
-     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-    </td>
-    <td>
-     <select name="new_unit_[% loop.count %]">
-      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
-     </select>
-    </td>
-    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
-  [% END %]
- </table>
-
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
-
-</form>
-
diff --git a/templates/webpages/dbupgrade/units_set_default.html b/templates/webpages/dbupgrade/units_set_default.html
new file mode 100644 (file)
index 0000000..285f11b
--- /dev/null
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
+
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="unit_type" value="dimension">
+ <input type="hidden" name="action" value="login">
+ <input type="hidden" name="action2" value="">
+
+ <p>
+  [% '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 %]
+ </p>
+
+ <table>
+  <tr>
+   <td>[% 'Dimension unit' | $T8 %]:</td>
+   <td>
+    <select name="default_dimension_unit">
+     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
+    </select>
+   </td>
+  </tr>
+  <tr>
+
+   <td>[% 'Service unit' | $T8 %]:</td>
+   <td>
+    <select name="default_service_unit">
+     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
+    </select>
+   </td>
+  </tr>
+ </table>
+
+ <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]"></p>
+
+</form>
diff --git a/templates/webpages/dbupgrade/units_set_default_de.html b/templates/webpages/dbupgrade/units_set_default_de.html
deleted file mode 100644 (file)
index 1377c6f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- <p>
-  Es gibt noch Eintr&auml;ge in der Datenbank, f&uuml;r die keine Einheit zugeordnet ist.
-  Sie m&uuml;ssen eine Ma&szlig;- und eine Dienstleistungseinheit ausw&auml;hlen, die diesen Waren und Dienstleistungen, denen noch keine Einheit zugeordnet ist, zugeordnet wird.
- </p>
-
- <table>
-  <tr>
-   <td>Ma&szlig;einheit:</td>
-   <td>
-    <select name="default_dimension_unit">
-     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-
-   <td>Dienstleistungseinheit:</td>
-   <td>
-    <select name="default_service_unit">
-     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
- </table>
-
- <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="Einheiten zuweisen"></p>
-
-</form>
diff --git a/templates/webpages/dbupgrade/units_set_default_done.html b/templates/webpages/dbupgrade/units_set_default_done.html
new file mode 100644 (file)
index 0000000..4dbf5c2
--- /dev/null
@@ -0,0 +1,8 @@
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
+
+<p>[% 'No entries were found which had no unit assigned to them.' | $T8 %]</p>
+
+<p>[% 'The database upgrade for the introduction of units is now complete.' | $T8 %]</p>
+
+<hr>
diff --git a/templates/webpages/dbupgrade/units_set_default_done_de.html b/templates/webpages/dbupgrade/units_set_default_done_de.html
deleted file mode 100644 (file)
index 799ba6f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
-
-<p>Es wurden keine Eintr&auml;ge gefunden, denen keine Einheit zugeordnet war.</p>
-
-<p>Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.</p>
-
-<hr>
diff --git a/templates/webpages/dbupgrade/units_set_default_done_en.html b/templates/webpages/dbupgrade/units_set_default_done_en.html
deleted file mode 100644 (file)
index 623fdf2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="listtop">Step 3 of 3: Default units</div>
-
-<p>No entries were found which had no unit assigned to them.</p>
-
-<p>The database upgrade for the introduction of units is now complete.</p>
-
-<hr>
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 (file)
index 0a6801d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
-
-<p><translate>No entries were found which had no unit assigned to them.</translate></p>
-
-<p><translate>The database upgrade for the introduction of units is now complete.</translate></p>
-
-<hr>
diff --git a/templates/webpages/dbupgrade/units_set_default_en.html b/templates/webpages/dbupgrade/units_set_default_en.html
deleted file mode 100644 (file)
index 337c874..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE HTML %]<div class="listtop">Step 3 of 3: Default units</div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- <p>
-  There are still entries in the database for which no unit has been assigned.
-  You have to chose a dimension unit and a service unit which will then be assigned to those entries.
- </p>
-
- <table>
-  <tr>
-   <td>Dimension unit:</td>
-   <td>
-    <select name="default_dimension_unit">
-     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-
-   <td>Service unit:</td>
-   <td>
-    <select name="default_service_unit">
-     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
- </table>
-
- <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="Assign units"></p>
-
-</form>
diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html
deleted file mode 100644 (file)
index e2779d9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
-
-<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="unit_type" value="dimension">
- <input type="hidden" name="action" value="login">
- <input type="hidden" name="action2" value="">
-
- <p>
-  <translate>There are still entries in the database for which no unit
-   has been assigned.</translate>
-  <translate>You have to chose a dimension unit and a service unit
-   which will then be assigned to those entries.</translate>
- </p>
-
- <table>
-  <tr>
-   <td><translate>Dimension unit</translate>:</td>
-   <td>
-    <select name="default_dimension_unit">
-     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-
-   <td><translate>Service unit</translate>:</td>
-   <td>
-    <select name="default_service_unit">
-     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
- </table>
-
- <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>"></p>
-
-</form>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings.html b/templates/webpages/dbupgrade/update_templates_warnings.html
new file mode 100644 (file)
index 0000000..81bf7b8
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Warnings during template upgrade' | $T8 %]</div>
+
+<p>[% 'The following warnings occured during an upgrade to the document templates:' | $T8 %]</p>
+
+<p>
+ <ul>
+  [% FOREACH row = WARNINGS %]
+   <li>[% row.message %]</li>
+  [% END %]
+ </ul>
+</p>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_de.html b/templates/webpages/dbupgrade/update_templates_warnings_de.html
deleted file mode 100644 (file)
index 4b8f00b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<div class="listtop">Warnungen bei Aktualisierung der Dokumentenvorlagen</div>
-
-<p>Die folgenden Warnungen traten w&auml;hrend einer Aktualisierung der Dokumentenvorlagen auf:</p>
-
-<p>
- <ul>
-  [% FOREACH row = WARNINGS %]
-   <li>[% row.message %]</li>
-  [% END %]
- </ul>
-</p>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_en.html b/templates/webpages/dbupgrade/update_templates_warnings_en.html
deleted file mode 100644 (file)
index 50717d5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<div class="listtop">Warnings during template upgrade</div>
-
-<p>The following warnings occured during an upgrade to the document templates:</p>
-
-<p>
- <ul>
-  [% FOREACH row = WARNINGS %]
-   <li>[% row.message %]</li>
-  [% END %]
- </ul>
-</p>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html
deleted file mode 100644 (file)
index 69e20ef..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<div class="listtop"><translate>Warnings during template upgrade</translate></div>
-
-<p><translate>The following warnings occured during an upgrade to the
-  document templates:</translate></p>
-
-<p>
- <ul>
-  [% FOREACH row = WARNINGS %]
-   <li>[% row.message %]</li>
-  [% END %]
- </ul>
-</p>
diff --git a/templates/webpages/dbupgrade/upgrade_message2.html b/templates/webpages/dbupgrade/upgrade_message2.html
new file mode 100644 (file)
index 0000000..f704710
--- /dev/null
@@ -0,0 +1,6 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<ul>
+ <li>[% LxERP.t8('Applying #1:', file) | html %] [% description %]</li>
+</ul>
+
diff --git a/templates/webpages/dbupgrade/upgrade_message2_de.html b/templates/webpages/dbupgrade/upgrade_message2_de.html
deleted file mode 100644 (file)
index 2c2f57f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[% USE HTML %]<ul>
- <li>F&uuml;hre [% HTML.escape(file) %] aus: [% description %]</li>
-</ul>
-
diff --git a/templates/webpages/dbupgrade/upgrade_message2_en.html b/templates/webpages/dbupgrade/upgrade_message2_en.html
deleted file mode 100644 (file)
index fcb437d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[% USE HTML %]<ul>
- <li>Applying [% HTML.escape(file) %]: [% description %]</li>
-</ul>
-
diff --git a/templates/webpages/dbupgrade/upgrade_message2_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html
deleted file mode 100644 (file)
index f7aedd1..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[% USE HTML %]<ul>
- <li><translate>Applying [% HTML.escape(file) %]:</translate> [% description %]</li>
-</ul>
-
diff --git a/templates/webpages/dbupgrade/warehouse_form.html b/templates/webpages/dbupgrade/warehouse_form.html
new file mode 100644 (file)
index 0000000..5edff88
--- /dev/null
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]
+<div class="listtop">[% 'Warehouse Migration' | $T8 %]</div>
+
+<form action="[% script %]" method="POST">
+ <p>
+  [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
+  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
+  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
+ </p>
+
+ <p>[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]</p>
+
+ <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">[% 'Yes' | $T8 %]</label>
+ <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">[% 'No' | $T8 %]</label>
+
+ <p>[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]</p>
+ <input name="import_warehouse" size="50">
+
+ <p>[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]<p>
+
+  <input name="bin_default" size="50">
+
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
+</form>
diff --git a/templates/webpages/dbupgrade/warehouse_form_de.html b/templates/webpages/dbupgrade/warehouse_form_de.html
deleted file mode 100644 (file)
index 77972fc..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-<div class="listtop">Lagermigration</div>
-
-<form action="[% script %]" method="POST">
- <p>
-  Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.
-  Dieses update &auml;ndert die Art und Weise wie Lagermengen gez&auml;lt werden.
-  Als Konsequenz k&ouml;nnen die gespeicherten Mengen entweder in ein Lager &uuml;berf&uuml;hrt werden, oder f&uuml;r eine frische Lagerverwaltung resettet werden.
- </p>
-
- <p>M&ouml;chten Sie die vorhandenen Mengendaten in ein Lager &uuml;bertragen?</p>
-
- <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">Ja</label>
- <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">Nein</label>
-
- <p>Bitte geben Sie den Namen des Ziellagers f&uuml;r die &uuml;bernommenen Daten ein.</p>
- <input name="import_warehouse" size="50">
-
- <p>Da Lagerpl&auml;tze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.<p>
-
-  <input name="bin_default" size="50">
-
- <p><input type="submit" value="Weiter"></p>
-</form>
diff --git a/templates/webpages/dbupgrade/warehouse_form_en.html b/templates/webpages/dbupgrade/warehouse_form_en.html
deleted file mode 100644 (file)
index cee2947..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-<div class="listtop">Warehouse Migration</div>
-
-<form action="[% script %]" method="POST">
- <p>
-  Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.
-  This update will change the nature the onhand of goods is tracked.
-  As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking
- </p>
-
- <p>Do you want to store the existing onhand values into a new warehouse?</p>
-
- <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">Yes</label>
- <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">No</label>
-
- <p>Please specify a description for the warehouse designated for these goods.</p>
- <input name="import_warehouse" size="50">
-
- <p>Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.<p>
-
-  <input name="bin_default" size="50">
-
- <p><input type="submit" value="Continue"></p>
-</form>
diff --git a/templates/webpages/dbupgrade/warehouse_form_master.html b/templates/webpages/dbupgrade/warehouse_form_master.html
deleted file mode 100644 (file)
index 3ad1adb..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]
-<div class="listtop"><translate>Warehouse Migration</translate></div>
-
-<form action="[% script %]" method="POST">
- <p>
-  <translate>Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.</translate>
-  <translate>This update will change the nature the onhand of goods is tracked.</translate>
-  <translate>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</translate>
- </p>
-
- <p><translate>Do you want to store the existing onhand values into a new warehouse?</translate></p>
-
- <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y"><translate>Yes</translate></label>
- <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N"><translate>No</translate></label>
-
- <p><translate>Please specify a description for the warehouse designated for these goods.</translate></p>
- <input name="import_warehouse" size="50">
-
- <p><translate>Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.</translate><p>
-
-  <input name="bin_default" size="50">
-
- <p><input type="submit" value="<translate>Continue</translate>"></p>
-</form>
diff --git a/templates/webpages/dbupgrade/warning.html b/templates/webpages/dbupgrade/warning.html
new file mode 100644 (file)
index 0000000..4e2d780
--- /dev/null
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="action" value="login">
+
+ <p>
+  [% LxERP.t8('Lx-Office is about to update the database <b>#1</b>.', dbname) | html %]
+  [% 'You should create a backup of the database before proceeding because the backup might not be reversible.' | $T8 %]
+ </p>
+
+ <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]">
+</form>
diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html
deleted file mode 100644 (file)
index 3be95a2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[% USE HTML %]<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
-
- <p>
-  Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.
- </p>
-
- <input type="submit" name="dummy" value="Weiter">
-</form>
diff --git a/templates/webpages/dbupgrade/warning_en.html b/templates/webpages/dbupgrade/warning_en.html
deleted file mode 100644 (file)
index e084d53..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[% USE HTML %]<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
-
- <p>
-  Lx-Office is about to update the database <b>[% HTML.escape(dbname) %]</b>. You should create a backup of the database before proceeding because the backup might not be reversible.
- </p>
-
- <input type="submit" name="dummy" value="Continue">
-</form>
diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
deleted file mode 100644 (file)
index 10f70a4..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML %]<form name="Form" method="post" action="login.pl">
-
- <input type="hidden" name="action" value="login">
-
- <p>
-  <translate>Lx-Office is about to update the
-   database <b>[% HTML.escape(dbname) %]</b>. You should create a
-   backup of the database before proceeding because the backup might not
-   be reversible.</translate>
- </p>
-
- <input type="submit" name="dummy" value="<translate>Continue</translate>">
-</form>
diff --git a/templates/webpages/do/delete.html b/templates/webpages/do/delete.html
new file mode 100644 (file)
index 0000000..9cd3592
--- /dev/null
@@ -0,0 +1,23 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+
+ <div class="listtop">[% 'Delete delivery order' | $T8 %]</div>
+
+ <form method="post" action="do.pl">
+
+  <h2 class="confirm">[% 'Confirm' | $T8 %]</h2>
+
+  <p>[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]</p>
+
+  [%- FOREACH row = VARIABLES %]
+  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
+  <input type="hidden" name="no_nextsub" value="update">
+  <input name="action" class="submit" type="submit" value="[% 'Yes' | $T8 %]">
+  <input name="action" class="submit" type="submit" value="[% 'No' | $T8 %]">
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/do/delete_de.html b/templates/webpages/do/delete_de.html
deleted file mode 100644 (file)
index afb8e3e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop">Lieferschein l&ouml;schen</div>
-
- <form method="post" action="do.pl">
-
-  <h2 class="confirm">Best&auml;tigen</h2>
-
-  <p>[% LxERP.format_string('Sind Sie sicher, dass Sie Lieferschein #1 l&ouml;schen wollen?', donumber) %]</p>
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
-  <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="Ja">
-  <input name="action" class="submit" type="submit" value="Nein">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/delete_en.html b/templates/webpages/do/delete_en.html
deleted file mode 100644 (file)
index 2e7e649..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop">Delete delivery order</div>
-
- <form method="post" action="do.pl">
-
-  <h2 class="confirm">Confirm</h2>
-
-  <p>[% LxERP.format_string('Are you sure you want to delete Delivery Order Number #1?', donumber) %]</p>
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
-  <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="Yes">
-  <input name="action" class="submit" type="submit" value="No">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/delete_master.html b/templates/webpages/do/delete_master.html
deleted file mode 100644 (file)
index cf550d3..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- <div class="listtop"><translate>Delete delivery order</translate></div>
-
- <form method="post" action="do.pl">
-
-  <h2 class="confirm"><translate>Confirm</translate></h2>
-
-  <p>[% LxERP.format_string('<translate>Are you sure you want to delete Delivery Order Number #1?</translate>', donumber) %]</p>
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
-  <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="<translate>Yes</translate>">
-  <input name="action" class="submit" type="submit" value="<translate>No</translate>">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html
new file mode 100644 (file)
index 0000000..b81ce8c
--- /dev/null
@@ -0,0 +1,101 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<!-- <body> -->
+<!--  <form> -->
+<!--   <p> -->
+<!--    <table> -->
+
+ [%- IF delivered %]
+ [%- SET RO = ' readonly' %]
+ [%- END %]
+
+    <tr>
+     <td>
+      <table>
+       <tr valign="bottom">
+        <th align="left">[% 'Notes' | $T8 %]</th>
+        <th align="left">[% 'Internal Notes' | $T8 %]</th>
+       </tr>
+
+       <tr valign="top">
+        <td><textarea name="notes" rows="[% LxERP.numtextrows(notes, 25, 8, 2) %]" cols="25" wrap="soft"[% RO %]>[% HTML.escape(notes) %]</textarea></td>
+        <td><textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea></td>
+       </tr>
+      </table>
+
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  [%- IF conf_webdav %]
+  <div class="listtop" align="left">[% 'Documents in the WebDAV repository' | $T8 %]</div>
+
+  <p>
+   <table width="100%">
+    <tr>
+     <td align="left" width="30%"><b>[% 'File name' | $T8 %]</b></td>
+     <td align="left" width="70%"><b>[% 'WebDAV link' | $T8 %]</b></td>
+    </tr>
+
+    [%- FOREACH file = WEBDAV %]
+    <tr>
+     <td align="left">[% HTML.escape(file.name) %]</td>
+     <td align="left"><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
+    </tr>
+    [%- END %]
+
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+  [%- END %]
+
+  <p>[% PRINT_OPTIONS %]</p>
+
+  <p>
+   [% 'Edit the Delivery Order' | $T8 %]<br>
+   <input type="hidden" name="action" value="dispatcher">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="[% 'Update' | $T8 %]">
+   [%- UNLESS delivered %]
+   [%- IF vc == 'customer' %]
+   <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
+   [%- END %]
+   [%- END %]
+   <input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
+   <input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">
+   [%- UNLESS delivered %]
+   <input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]">
+   [%- IF vc == 'customer' %]
+   <input class="submit" type="submit" name="action_transfer_out" value="[% 'Transfer out' | $T8 %]">
+   [%- ELSE %]
+   <input class="submit" type="submit" name="action_transfer_in" value="[% 'Transfer in' | $T8 %]">
+   [%- END %]
+   [%- END %]
+   [%- IF id %]
+   [%- UNLESS closed %]
+   <input class="submit" type="submit" name="action_mark_closed" value="[% 'Mark closed' | $T8 %]">
+   [%- END %]
+   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+   [%- END %]
+  </p>
+
+  [%- IF id %]
+  <p>
+   [% 'Workflow Delivery Order' | $T8 %]<br>
+   <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
+   [% UNLESS delivered %]
+   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+   [% END %]
+   <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
+  </p>
+  [%- END %]
+
+  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
deleted file mode 100644 (file)
index 693d032..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-[% USE HTML %][% USE LxERP %]<!-- <body> -->
-<!--  <form> -->
-<!--   <p> -->
-<!--    <table> -->
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
-    <tr>
-     <td>
-      <table>
-       <tr valign="bottom">
-        <th align="left">Bemerkungen</th>
-        <th align="left">interne Bemerkungen</th>
-       </tr>
-
-       <tr valign="top">
-        <td><textarea name="notes" rows="[% LxERP.numtextrows(notes, 25, 8, 2) %]" cols="25" wrap="soft"[% RO %]>[% HTML.escape(notes) %]</textarea></td>
-        <td><textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea></td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  [%- IF conf_webdav %]
-  <div class="listtop" align="left">Dokumente im WebDAV-Repository</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>WebDAV-Link</b></td>
-    </tr>
-
-    [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% HTML.escape(file.name) %]</td>
-     <td align="left"><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-  [%- END %]
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   Lieferschein bearbeiten<br>
-   <input type="hidden" name="action" value="dispatcher">
-   <input class="submit" type="submit" name="action_update" id="update_button" value="Erneuern">
-   [%- UNLESS delivered %]
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_ship_to" value="Lieferadresse">
-   [%- END %]
-   [%- END %]
-   <input class="submit" type="submit" name="action_print" value="Drucken">
-   <input class="submit" type="submit" name="action_e_mail" value="eMail">
-   [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action_save" value="Speichern">
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_transfer_out" value="Auslagern">
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action_transfer_in" value="Einlagern">
-   [%- END %]
-   [%- END %]
-   [%- IF id %]
-   [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="Als geschlossen markieren">
-   [%- END %]
-   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
-   [%- END %]
-  </p>
-
-  [%- IF id %]
-  <p>
-   Workflow Lieferschein<br>
-   <input class="submit" type="submit" name="action_save_as_new" value="als neu speichern">
-   [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="Löschen">
-   [% END %]
-   <input class="submit" type="submit" name="action_invoice" value="Rechnung">
-  </p>
-  [%- END %]
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/form_footer_en.html b/templates/webpages/do/form_footer_en.html
deleted file mode 100644 (file)
index 6626c0b..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-[% USE HTML %][% USE LxERP %]<!-- <body> -->
-<!--  <form> -->
-<!--   <p> -->
-<!--    <table> -->
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
-    <tr>
-     <td>
-      <table>
-       <tr valign="bottom">
-        <th align="left">Notes</th>
-        <th align="left">Internal Notes</th>
-       </tr>
-
-       <tr valign="top">
-        <td><textarea name="notes" rows="[% LxERP.numtextrows(notes, 25, 8, 2) %]" cols="25" wrap="soft"[% RO %]>[% HTML.escape(notes) %]</textarea></td>
-        <td><textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea></td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  [%- IF conf_webdav %]
-  <div class="listtop" align="left">Documents in the WebDAV repository</div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>File name</b></td>
-     <td align="left" width="70%"><b>WebDAV link</b></td>
-    </tr>
-
-    [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% HTML.escape(file.name) %]</td>
-     <td align="left"><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-  [%- END %]
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   Edit the Delivery Order<br>
-   <input type="hidden" name="action" value="dispatcher">
-   <input class="submit" type="submit" name="action_update" id="update_button" value="Update">
-   [%- UNLESS delivered %]
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_ship_to" value="Ship to">
-   [%- END %]
-   [%- END %]
-   <input class="submit" type="submit" name="action_print" value="Print">
-   <input class="submit" type="submit" name="action_e_mail" value="E-mail">
-   [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action_save" value="Save">
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_transfer_out" value="Transfer out">
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action_transfer_in" value="Transfer in">
-   [%- END %]
-   [%- END %]
-   [%- IF id %]
-   [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="Mark closed">
-   [%- END %]
-   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="history">
-   [%- END %]
-  </p>
-
-  [%- IF id %]
-  <p>
-   Workflow Delivery Order<br>
-   <input class="submit" type="submit" name="action_save_as_new" value="Save as new">
-   [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="Delete">
-   [% END %]
-   <input class="submit" type="submit" name="action_invoice" value="Invoice">
-  </p>
-  [%- END %]
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
deleted file mode 100644 (file)
index cb04003..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-[% USE HTML %][% USE LxERP %]<!-- <body> -->
-<!--  <form> -->
-<!--   <p> -->
-<!--    <table> -->
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
-    <tr>
-     <td>
-      <table>
-       <tr valign="bottom">
-        <th align="left"><translate>Notes</translate></th>
-        <th align="left"><translate>Internal Notes</translate></th>
-       </tr>
-
-       <tr valign="top">
-        <td><textarea name="notes" rows="[% LxERP.numtextrows(notes, 25, 8, 2) %]" cols="25" wrap="soft"[% RO %]>[% HTML.escape(notes) %]</textarea></td>
-        <td><textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea></td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  [%- IF conf_webdav %]
-  <div class="listtop" align="left"><translate>Documents in the WebDAV repository</translate></div>
-
-  <p>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b><translate>File name</translate></b></td>
-     <td align="left" width="70%"><b><translate>WebDAV link</translate></b></td>
-    </tr>
-
-    [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% HTML.escape(file.name) %]</td>
-     <td align="left"><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-  [%- END %]
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   <translate>Edit the Delivery Order</translate><br>
-   <input type="hidden" name="action" value="dispatcher">
-   <input class="submit" type="submit" name="action_update" id="update_button" value="<translate>Update</translate>">
-   [%- UNLESS delivered %]
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_ship_to" value="<translate>Ship to</translate>">
-   [%- END %]
-   [%- END %]
-   <input class="submit" type="submit" name="action_print" value="<translate>Print</translate>">
-   <input class="submit" type="submit" name="action_e_mail" value="<translate>E-mail</translate>">
-   [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action_save" value="<translate>Save</translate>">
-   [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_transfer_out" value="<translate>Transfer out</translate>">
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action_transfer_in" value="<translate>Transfer in</translate>">
-   [%- END %]
-   [%- END %]
-   [%- IF id %]
-   [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="<translate>Mark closed</translate>">
-   [%- END %]
-   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
-   [%- END %]
-  </p>
-
-  [%- IF id %]
-  <p>
-   <translate>Workflow Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action_save_as_new" value="<translate>Save as new</translate>">
-   [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="<translate>Delete</translate>">
-   [% END %]
-   <input class="submit" type="submit" name="action_invoice" value="<translate>Invoice</translate>">
-  </p>
-  [%- END %]
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
new file mode 100644 (file)
index 0000000..2f98575
--- /dev/null
@@ -0,0 +1,356 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body onload="on_load()">
+
+ <script type="text/javascript" src="js/show_form_details.js"></script>
+ <script type="text/javascript" src="js/show_history.js"></script>
+ <script type="text/javascript" src="js/show_vc_details.js"></script>
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+ <script type="text/javascript" src="js/vendor_selection.js"></script>
+ <script type="text/javascript" src="js/calculate_qty.js"></script>
+ <script type="text/javascript" src="js/stock_in_out.js"></script>
+
+ <script type="text/javascript">
+  <!--
+      function on_load() {
+        [% IF onload %][% onload %];[% END %]
+        setupDateFormat('[% myconfig_dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+        setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
+
+        [%- UNLESS delivered %]
+        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
+        [%- END %]
+      }
+    -->
+ </script>
+
+ <style type="text/css">
+  .fixed_width {
+    width: 250px;
+  }
+ </style>
+
+ [%- 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 %]
+
+ <div class="listtop">[% title %]</div>
+
+ [%- IF ERRORS && ERRORS.size %]
+ <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
+ [%- END %]
+
+ <form method="post" name="do" action="do.pl">
+
+  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
+  <input type="hidden" name="bcc" value="[% HTML.escape(bcc) %]">
+  <input type="hidden" name="business" value="[% HTML.escape(business) %]">
+  <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
+  <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
+  <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
+  <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
+  <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
+  <input type="hidden" name="email" value="[% HTML.escape(email) %]">
+  <input type="hidden" name="emailed" value="[% HTML.escape(emailed) %]">
+  <input type="hidden" name="format" value="[% HTML.escape(format) %]">
+  <input type="hidden" name="formname" value="[% HTML.escape(formname) %]">
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
+  <input type="hidden" name="media" value="[% HTML.escape(media) %]">
+  <input type="hidden" name="message" value="[% HTML.escape(message) %]">
+  <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
+  <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
+  <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">
+  <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
+  <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
+  <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
+  <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
+  <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
+  <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
+  <input type="hidden" name="shiptoemail" value="[% HTML.escape(shiptoemail) %]">
+  <input type="hidden" name="shiptofax" value="[% HTML.escape(shiptofax) %]">
+  <input type="hidden" name="shiptoname" value="[% HTML.escape(shiptoname) %]">
+  <input type="hidden" name="shiptophone" value="[% HTML.escape(shiptophone) %]">
+  <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
+  <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
+  <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
+  <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
+  <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
+  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
+  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
+  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+
+  <p>
+   <table width="100%">
+    <tr valign="top">
+     <td>
+      <table width="100%">
+       <tr>
+        <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
+        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
+        <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
+        <td>
+         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
+         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
+         [%- ELSE %]
+         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
+          [%- FOREACH row = ALL_VC %]
+          <option value="[% HTML.escape(row.value) %]" [% IF the_oldvc == row.value %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+          [%- END %]
+         </select>
+         <input type="hidden" name="select[% vc %]" value="1">
+         [%- END %]
+         <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc %]')">
+        </td>
+
+        [%- IF ALL_CONTACTS.size %]
+        <tr>
+         <th align="right">[% 'Contact Person' | $T8 %]</th>
+         <td>
+          [%- IF delivered %]
+          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
+          [%- IF cp_id == row.cp_id %]
+          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
+          [%- END %]
+          [%- ELSE %]
+          <select name="cp_id" class="fixed_width" >
+           <option></option>
+           [%- FOREACH row = ALL_CONTACTS %]
+           <option value="[% HTML.escape(row.cp_id) %]"[% IF cp_id == row.cp_id %] selected[% END %]>
+            [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
+           </option>
+           [%- END %]
+          </select>
+          [%- END %]
+         </td>
+        </tr>
+        [%- END %]
+
+        [%- IF ALL_SHIPTO.size %]
+        <tr>
+         <th align="right">[% 'Shipping Address' | $T8 %]</th>
+         <td>
+          [%- IF delivered %]
+          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
+          [%- 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 %]
+          <select name="shipto_id" class="fixed_width" >
+           <option></option>
+           [%- FOREACH row = ALL_SHIPTO %]
+           <option value="[% HTML.escape(row.shipto_id) %]"[% IF shipto_id == row.shipto_id %] selected[% END %]>
+            [%- 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 -%]
+           </option>
+           [%- END %]
+          </select>
+          [%- END %]
+         </td>
+        </tr>
+        [%- END %]
+
+        [%- IF business %]
+        <tr>
+         <th align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
+         <td>[% HTML.escape(business) %]</td>
+        </tr>
+        [%- END %]
+
+        [%- IF max_dunning_level %]
+        <tr>
+         <th align="right">[% 'Max. Dunning Level' | $T8 %]</th>
+         <td>
+          <b>[% HTML.escape(max_dunning_level) %]</b>; [% 'Dunning Amount' | $T8 %]:
+          <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
+         </td>
+        </tr>
+        [%- END %]
+       </tr>
+
+       [%- IF ALL_DEPARTMENTS.size %]
+       <tr>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+        <td colspan="3">
+         [%- IF delivered %]
+         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
+         [%- FOREACH row = ALL_DEPARTMENTS %]
+         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         <select name="department" class="fixed_width">
+          <option></option>
+          [%- FOREACH row = ALL_DEPARTMENTS %]
+          <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
+          [%- END %]
+         </select>
+         [%- END %]
+        </td>
+       </tr>
+       [%- END %]
+
+       <tr>
+        <th align="right">[% 'Shipping Point' | $T8 %]</th>
+        <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
+       </tr>
+
+       <tr>
+        <th align="right">[% 'Ship via' | $T8 %]</th>
+        <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
+       </tr>
+
+       <tr>
+        <th align="right">[% 'Transaction description' | $T8 %]</th>
+        <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
+       </tr>
+
+      </table>
+     </td>
+
+     <td align="right">
+      <table>
+
+       <tr>
+        <td colspan="2" align="center">
+         [%- 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 %]
+        </td>
+       </tr>
+
+       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
+
+       <tr>
+        <th align="right">[% 'Employee' | $T8 %]</th>
+        <td>
+         [%- IF delivered %]
+         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
+         [%- FOREACH row = ALL_EMPLOYEES %]
+         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         <select name="employee_id">
+          [%- FOREACH row = ALL_EMPLOYEES %]
+          <option value="[% HTML.escape(row.id) %]"[% IF row.id == employee_id %] selected[% END %]>
+           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
+          </option>
+          [%- END %]
+         </select>
+         [%- END %]
+        </td>
+       </tr>
+
+       [%- IF is_customer %]
+       [%- IF salesman_id %]
+       [%- SET the_salesman_id = salesman_id %]
+       [%- ELSE %]
+       [%- SET the_salesman_id = employee_id %]
+       [%- END %]
+       <tr>
+        <th align="right">[% 'Salesman' | $T8 %]</th>
+        <td>
+         [%- IF delivered %]
+         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
+         [%- FOREACH row = ALL_SALESMEN %]
+         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         <select name="salesman_id">
+          [%- FOREACH row = ALL_SALESMEN %]
+          <option value="[% HTML.escape(row.id) %]"[% IF row.id == the_salesman_id %] selected[% END %]>
+           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
+          </option>
+          [%- END %]
+         </select>
+         [%- END %]
+        </td>
+       </tr>
+       [%- END %]
+
+       <tr>
+        <th width="70%" align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
+        <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
+       </tr>
+
+       <tr>
+        <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+        <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
+       </tr>
+
+       <tr>
+        <th width="70%" align="right" nowrap>[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
+        <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
+       </tr>
+
+       <tr>
+        <th align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
+        <td nowrap>
+         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
+                onBlur="check_right_date_format(this)"[% RO %]>
+         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
+        </td>
+       </tr>
+
+       <tr>
+        <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
+        <td>
+         [%- IF delivered %]
+         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
+         [%- FOREACH row = ALL_PROJECTS %]
+         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
+         [%- END %]
+         [%- ELSE %]
+         <select name="globalproject_id">
+          <option></option>
+          [%- FOREACH row = ALL_PROJECTS %]
+          <option value="[% HTML.escape(row.id) %]"[% IF globalproject_id == row.id %] selected[% END %]>[% HTML.escape(row.projectnumber) %]</option>
+          [%- END %]
+         </select>
+         [%- END %]
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+   </table>
diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html
deleted file mode 100644 (file)
index 3722278..0000000
+++ /dev/null
@@ -1,355 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load()">
-
- <script type="text/javascript" src="js/show_form_details.js"></script>
- <script type="text/javascript" src="js/show_history.js"></script>
- <script type="text/javascript" src="js/show_vc_details.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
- <script type="text/javascript" src="js/vendor_selection.js"></script>
- <script type="text/javascript" src="js/calculate_qty.js"></script>
- <script type="text/javascript" src="js/stock_in_out.js"></script>
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        [% IF onload %][% onload %];[% END %]
-        setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
-        setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
-
-        [%- UNLESS delivered %]
-        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
-        [%- END %]
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- [%- 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 %]
-
- <div class="listtop">[% title %]</div>
-
- [%- IF ERRORS && ERRORS.size %]
- <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
- [%- END %]
-
- <form method="post" name="do" action="do.pl">
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-  <input type="hidden" name="bcc" value="[% HTML.escape(bcc) %]">
-  <input type="hidden" name="business" value="[% HTML.escape(business) %]">
-  <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
-  <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
-  <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-  <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
-  <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
-  <input type="hidden" name="email" value="[% HTML.escape(email) %]">
-  <input type="hidden" name="emailed" value="[% HTML.escape(emailed) %]">
-  <input type="hidden" name="format" value="[% HTML.escape(format) %]">
-  <input type="hidden" name="formname" value="[% HTML.escape(formname) %]">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
-  <input type="hidden" name="media" value="[% HTML.escape(media) %]">
-  <input type="hidden" name="message" value="[% HTML.escape(message) %]">
-  <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
-  <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
-  <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">
-  <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
-  <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
-  <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
-  <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
-  <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
-  <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
-  <input type="hidden" name="shiptoemail" value="[% HTML.escape(shiptoemail) %]">
-  <input type="hidden" name="shiptofax" value="[% HTML.escape(shiptofax) %]">
-  <input type="hidden" name="shiptoname" value="[% HTML.escape(shiptoname) %]">
-  <input type="hidden" name="shiptophone" value="[% HTML.escape(shiptophone) %]">
-  <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
-  <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
-  <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
-  <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
-  <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
-  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-
-  <p>
-   <table width="100%">
-    <tr valign="top">
-     <td>
-      <table width="100%">
-       <tr>
-        <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
-        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
-        <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
-        <td>
-         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
-         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
-         [%- ELSE %]
-         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
-          [%- FOREACH row = ALL_VC %]
-          <option value="[% HTML.escape(row.value) %]" [% IF the_oldvc == row.value %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-         <input type="hidden" name="select[% vc %]" value="1">
-         [%- END %]
-         <input type="button" value="D" onclick="show_vc_details('[% vc %]')">
-        </td>
-
-        [%- IF ALL_CONTACTS.size %]
-        <tr>
-         <th align="right">Ansprechpartner</th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-          [%- IF cp_id == row.cp_id %]
-          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-          [%- END %]
-          [%- ELSE %]
-          <select name="cp_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_CONTACTS %]
-           <option value="[% HTML.escape(row.cp_id) %]"[% IF cp_id == row.cp_id %] selected[% END %]>
-            [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF ALL_SHIPTO.size %]
-        <tr>
-         <th align="right">Lieferadresse</th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
-          [%- 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 %]
-          <select name="shipto_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_SHIPTO %]
-           <option value="[% HTML.escape(row.shipto_id) %]"[% IF shipto_id == row.shipto_id %] selected[% END %]>
-            [%- 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 -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF business %]
-        <tr>
-         <th align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</th>
-         <td>[% HTML.escape(business) %]</td>
-        </tr>
-        [%- END %]
-
-        [%- IF max_dunning_level %]
-        <tr>
-         <th align="right">höchste Mahnstufe</th>
-         <td>
-          <b>[% HTML.escape(max_dunning_level) %]</b>; gemahnter Betrag:
-          <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
-         </td>
-        </tr>
-        [%- END %]
-       </tr>
-
-       [%- IF ALL_DEPARTMENTS.size %]
-       <tr>
-        <th align="right" nowrap>Abteilung</th>
-        <td colspan="3">
-         [%- IF delivered %]
-         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-         [%- FOREACH row = ALL_DEPARTMENTS %]
-         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="department" class="fixed_width">
-          <option></option>
-          [%- FOREACH row = ALL_DEPARTMENTS %]
-          <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th align="right">Versandort</th>
-        <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right">Transportmittel</th>
-        <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right">Vorgangsbezeichnung</th>
-        <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
-       </tr>
-
-      </table>
-     </td>
-
-     <td align="right">
-      <table>
-
-       <tr>
-        <td colspan="2" align="center">
-         [%- IF delivered %]
-          [%- IF is_customer %]
-          ausgelagert
-          [%- ELSE %]
-          eingelagert
-          [%- END %]
-         [%- ELSE %]
-          [%- IF is_customer %]
-          noch nicht ausgelagert
-          [%- ELSE %]
-          noch nicht eingelagert
-          [%- END %]
-         [%- END %]
-         ;
-         [%- IF closed %]
-          Geschlossen
-         [%- ELSE %]
-          Offen
-         [%- END %]
-        </td>
-       </tr>
-
-       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-       <tr>
-        <th align="right">Bearbeiter</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="employee_id">
-          [%- FOREACH row = ALL_EMPLOYEES %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == employee_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-
-       [%- IF is_customer %]
-       [%- IF salesman_id %]
-       [%- SET the_salesman_id = salesman_id %]
-       [%- ELSE %]
-       [%- SET the_salesman_id = employee_id %]
-       [%- END %]
-       <tr>
-        <th align="right">Verkäufer/in</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
-         [%- FOREACH row = ALL_SALESMEN %]
-         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="salesman_id">
-          [%- FOREACH row = ALL_SALESMEN %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == the_salesman_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th width="70%" align="right" nowrap>Lieferscheinnummer</th>
-        <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>Auftragsnummer</th>
-        <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]Bestellnummer des Kunden[% ELSE %]Bestellnummer beim Lieferanten[% END %]</th>
-        <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Lieferscheindatum</th>
-        <td nowrap>
-         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
-                onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
-        </td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>Projektnummer</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
-         [%- FOREACH row = ALL_PROJECTS %]
-         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="globalproject_id">
-          <option></option>
-          [%- FOREACH row = ALL_PROJECTS %]
-          <option value="[% HTML.escape(row.id) %]"[% IF globalproject_id == row.id %] selected[% END %]>[% HTML.escape(row.projectnumber) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
diff --git a/templates/webpages/do/form_header_en.html b/templates/webpages/do/form_header_en.html
deleted file mode 100644 (file)
index 7110e1f..0000000
+++ /dev/null
@@ -1,355 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load()">
-
- <script type="text/javascript" src="js/show_form_details.js"></script>
- <script type="text/javascript" src="js/show_history.js"></script>
- <script type="text/javascript" src="js/show_vc_details.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
- <script type="text/javascript" src="js/vendor_selection.js"></script>
- <script type="text/javascript" src="js/calculate_qty.js"></script>
- <script type="text/javascript" src="js/stock_in_out.js"></script>
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        [% IF onload %][% onload %];[% END %]
-        setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
-        setupPoints('[% myconfig_numberformat %]', 'wrongformat');
-
-        [%- UNLESS delivered %]
-        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
-        [%- END %]
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- [%- 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 %]
-
- <div class="listtop">[% title %]</div>
-
- [%- IF ERRORS && ERRORS.size %]
- <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
- [%- END %]
-
- <form method="post" name="do" action="do.pl">
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-  <input type="hidden" name="bcc" value="[% HTML.escape(bcc) %]">
-  <input type="hidden" name="business" value="[% HTML.escape(business) %]">
-  <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
-  <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
-  <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-  <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
-  <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
-  <input type="hidden" name="email" value="[% HTML.escape(email) %]">
-  <input type="hidden" name="emailed" value="[% HTML.escape(emailed) %]">
-  <input type="hidden" name="format" value="[% HTML.escape(format) %]">
-  <input type="hidden" name="formname" value="[% HTML.escape(formname) %]">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
-  <input type="hidden" name="media" value="[% HTML.escape(media) %]">
-  <input type="hidden" name="message" value="[% HTML.escape(message) %]">
-  <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
-  <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
-  <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">
-  <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
-  <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
-  <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
-  <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
-  <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
-  <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
-  <input type="hidden" name="shiptoemail" value="[% HTML.escape(shiptoemail) %]">
-  <input type="hidden" name="shiptofax" value="[% HTML.escape(shiptofax) %]">
-  <input type="hidden" name="shiptoname" value="[% HTML.escape(shiptoname) %]">
-  <input type="hidden" name="shiptophone" value="[% HTML.escape(shiptophone) %]">
-  <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
-  <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
-  <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
-  <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
-  <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
-  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-
-  <p>
-   <table width="100%">
-    <tr valign="top">
-     <td>
-      <table width="100%">
-       <tr>
-        <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
-        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
-        <th align="right">[% IF is_customer %]Customer[% ELSE %]Vendor[% END %]</th>
-        <td>
-         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
-         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
-         [%- ELSE %]
-         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
-          [%- FOREACH row = ALL_VC %]
-          <option value="[% HTML.escape(row.value) %]" [% IF the_oldvc == row.value %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-         <input type="hidden" name="select[% vc %]" value="1">
-         [%- END %]
-         <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% vc %]')">
-        </td>
-
-        [%- IF ALL_CONTACTS.size %]
-        <tr>
-         <th align="right">Contact Person</th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-          [%- IF cp_id == row.cp_id %]
-          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-          [%- END %]
-          [%- ELSE %]
-          <select name="cp_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_CONTACTS %]
-           <option value="[% HTML.escape(row.cp_id) %]"[% IF cp_id == row.cp_id %] selected[% END %]>
-            [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF ALL_SHIPTO.size %]
-        <tr>
-         <th align="right">Shipping Address</th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
-          [%- 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 %]
-          <select name="shipto_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_SHIPTO %]
-           <option value="[% HTML.escape(row.shipto_id) %]"[% IF shipto_id == row.shipto_id %] selected[% END %]>
-            [%- 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 -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF business %]
-        <tr>
-         <th align="right">[% IF is_customer %]Customer type[% ELSE %]Vendor type[% END %]</th>
-         <td>[% HTML.escape(business) %]</td>
-        </tr>
-        [%- END %]
-
-        [%- IF max_dunning_level %]
-        <tr>
-         <th align="right">Max. Dunning Level</th>
-         <td>
-          <b>[% HTML.escape(max_dunning_level) %]</b>; Dunning Amount:
-          <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
-         </td>
-        </tr>
-        [%- END %]
-       </tr>
-
-       [%- IF ALL_DEPARTMENTS.size %]
-       <tr>
-        <th align="right" nowrap>Department</th>
-        <td colspan="3">
-         [%- IF delivered %]
-         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-         [%- FOREACH row = ALL_DEPARTMENTS %]
-         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="department" class="fixed_width">
-          <option></option>
-          [%- FOREACH row = ALL_DEPARTMENTS %]
-          <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th align="right">Shipping Point</th>
-        <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right">Ship via</th>
-        <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right">Transaction description</th>
-        <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
-       </tr>
-
-      </table>
-     </td>
-
-     <td align="right">
-      <table>
-
-       <tr>
-        <td colspan="2" align="center">
-         [%- IF delivered %]
-          [%- IF is_customer %]
-          transferred out
-          [%- ELSE %]
-          transferred in
-          [%- END %]
-         [%- ELSE %]
-          [%- IF is_customer %]
-          not transferred out yet
-          [%- ELSE %]
-          not transferred in yet
-          [%- END %]
-         [%- END %]
-         ;
-         [%- IF closed %]
-          Closed
-         [%- ELSE %]
-          Open
-         [%- END %]
-        </td>
-       </tr>
-
-       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-       <tr>
-        <th align="right">Employee</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="employee_id">
-          [%- FOREACH row = ALL_EMPLOYEES %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == employee_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-
-       [%- IF is_customer %]
-       [%- IF salesman_id %]
-       [%- SET the_salesman_id = salesman_id %]
-       [%- ELSE %]
-       [%- SET the_salesman_id = employee_id %]
-       [%- END %]
-       <tr>
-        <th align="right">Salesman</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
-         [%- FOREACH row = ALL_SALESMEN %]
-         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="salesman_id">
-          [%- FOREACH row = ALL_SALESMEN %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == the_salesman_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th width="70%" align="right" nowrap>Delivery Order Number</th>
-        <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>Order Number</th>
-        <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]Customer Order Number[% ELSE %]Vendor Order Number[% END %]</th>
-        <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Delivery Order Date</th>
-        <td nowrap>
-         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
-                onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
-        </td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>Project Number</th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
-         [%- FOREACH row = ALL_PROJECTS %]
-         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="globalproject_id">
-          <option></option>
-          [%- FOREACH row = ALL_PROJECTS %]
-          <option value="[% HTML.escape(row.id) %]"[% IF globalproject_id == row.id %] selected[% END %]>[% HTML.escape(row.projectnumber) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
deleted file mode 100644 (file)
index 44dd902..0000000
+++ /dev/null
@@ -1,355 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load()">
-
- <script type="text/javascript" src="js/show_form_details.js"></script>
- <script type="text/javascript" src="js/show_history.js"></script>
- <script type="text/javascript" src="js/show_vc_details.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
- <script type="text/javascript" src="js/vendor_selection.js"></script>
- <script type="text/javascript" src="js/calculate_qty.js"></script>
- <script type="text/javascript" src="js/stock_in_out.js"></script>
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        [% IF onload %][% onload %];[% END %]
-        setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-        setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
-
-        [%- UNLESS delivered %]
-        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
-        [%- END %]
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- [%- 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 %]
-
- <div class="listtop">[% title %]</div>
-
- [%- IF ERRORS && ERRORS.size %]
- <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
- [%- END %]
-
- <form method="post" name="do" action="do.pl">
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-  <input type="hidden" name="bcc" value="[% HTML.escape(bcc) %]">
-  <input type="hidden" name="business" value="[% HTML.escape(business) %]">
-  <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
-  <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
-  <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-  <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
-  <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
-  <input type="hidden" name="email" value="[% HTML.escape(email) %]">
-  <input type="hidden" name="emailed" value="[% HTML.escape(emailed) %]">
-  <input type="hidden" name="format" value="[% HTML.escape(format) %]">
-  <input type="hidden" name="formname" value="[% HTML.escape(formname) %]">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
-  <input type="hidden" name="media" value="[% HTML.escape(media) %]">
-  <input type="hidden" name="message" value="[% HTML.escape(message) %]">
-  <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
-  <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
-  <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">
-  <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
-  <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
-  <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
-  <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
-  <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
-  <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
-  <input type="hidden" name="shiptoemail" value="[% HTML.escape(shiptoemail) %]">
-  <input type="hidden" name="shiptofax" value="[% HTML.escape(shiptofax) %]">
-  <input type="hidden" name="shiptoname" value="[% HTML.escape(shiptoname) %]">
-  <input type="hidden" name="shiptophone" value="[% HTML.escape(shiptophone) %]">
-  <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
-  <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
-  <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
-  <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
-  <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
-  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-
-  <p>
-   <table width="100%">
-    <tr valign="top">
-     <td>
-      <table width="100%">
-       <tr>
-        <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
-        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
-        <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
-        <td>
-         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
-         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
-         [%- ELSE %]
-         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
-          [%- FOREACH row = ALL_VC %]
-          <option value="[% HTML.escape(row.value) %]" [% IF the_oldvc == row.value %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-         <input type="hidden" name="select[% vc %]" value="1">
-         [%- END %]
-         <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% vc %]')">
-        </td>
-
-        [%- IF ALL_CONTACTS.size %]
-        <tr>
-         <th align="right"><translate>Contact Person</translate></th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
-          [%- IF cp_id == row.cp_id %]
-          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-          [%- END %]
-          [%- ELSE %]
-          <select name="cp_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_CONTACTS %]
-           <option value="[% HTML.escape(row.cp_id) %]"[% IF cp_id == row.cp_id %] selected[% END %]>
-            [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF ALL_SHIPTO.size %]
-        <tr>
-         <th align="right"><translate>Shipping Address</translate></th>
-         <td>
-          [%- IF delivered %]
-          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
-          [%- 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 %]
-          <select name="shipto_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_SHIPTO %]
-           <option value="[% HTML.escape(row.shipto_id) %]"[% IF shipto_id == row.shipto_id %] selected[% END %]>
-            [%- 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 -%]
-           </option>
-           [%- END %]
-          </select>
-          [%- END %]
-         </td>
-        </tr>
-        [%- END %]
-
-        [%- IF business %]
-        <tr>
-         <th align="right">[% IF is_customer %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</th>
-         <td>[% HTML.escape(business) %]</td>
-        </tr>
-        [%- END %]
-
-        [%- IF max_dunning_level %]
-        <tr>
-         <th align="right"><translate>Max. Dunning Level</translate></th>
-         <td>
-          <b>[% HTML.escape(max_dunning_level) %]</b>; <translate>Dunning Amount</translate>:
-          <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
-         </td>
-        </tr>
-        [%- END %]
-       </tr>
-
-       [%- IF ALL_DEPARTMENTS.size %]
-       <tr>
-        <th align="right" nowrap><translate>Department</translate></th>
-        <td colspan="3">
-         [%- IF delivered %]
-         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-         [%- FOREACH row = ALL_DEPARTMENTS %]
-         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="department" class="fixed_width">
-          <option></option>
-          [%- FOREACH row = ALL_DEPARTMENTS %]
-          <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th align="right"><translate>Shipping Point</translate></th>
-        <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right"><translate>Ship via</translate></th>
-        <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right"><translate>Transaction description</translate></th>
-        <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
-       </tr>
-
-      </table>
-     </td>
-
-     <td align="right">
-      <table>
-
-       <tr>
-        <td colspan="2" align="center">
-         [%- IF delivered %]
-          [%- IF is_customer %]
-          <translate>transferred out</translate>
-          [%- ELSE %]
-          <translate>transferred in</translate>
-          [%- END %]
-         [%- ELSE %]
-          [%- IF is_customer %]
-          <translate>not transferred out yet</translate>
-          [%- ELSE %]
-          <translate>not transferred in yet</translate>
-          [%- END %]
-         [%- END %]
-         ;
-         [%- IF closed %]
-          <translate>Closed</translate>
-         [%- ELSE %]
-          <translate>Open</translate>
-         [%- END %]
-        </td>
-       </tr>
-
-       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-       <tr>
-        <th align="right"><translate>Employee</translate></th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
-         [%- FOREACH row = ALL_EMPLOYEES %]
-         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="employee_id">
-          [%- FOREACH row = ALL_EMPLOYEES %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == employee_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-
-       [%- IF is_customer %]
-       [%- IF salesman_id %]
-       [%- SET the_salesman_id = salesman_id %]
-       [%- ELSE %]
-       [%- SET the_salesman_id = employee_id %]
-       [%- END %]
-       <tr>
-        <th align="right"><translate>Salesman</translate></th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
-         [%- FOREACH row = ALL_SALESMEN %]
-         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="salesman_id">
-          [%- FOREACH row = ALL_SALESMEN %]
-          <option value="[% HTML.escape(row.id) %]"[% IF row.id == the_salesman_id %] selected[% END %]>
-           [%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %]
-          </option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-       [%- END %]
-
-       <tr>
-        <th width="70%" align="right" nowrap><translate>Delivery Order Number</translate></th>
-        <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
-        <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Order Number</translate>[% END %]</th>
-        <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Delivery Order Date</translate></th>
-        <td nowrap>
-         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
-                onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
-        </td>
-       </tr>
-
-       <tr>
-        <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
-        <td>
-         [%- IF delivered %]
-         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
-         [%- FOREACH row = ALL_PROJECTS %]
-         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
-         [%- END %]
-         [%- ELSE %]
-         <select name="globalproject_id">
-          <option></option>
-          [%- FOREACH row = ALL_PROJECTS %]
-          <option value="[% HTML.escape(row.id) %]"[% IF globalproject_id == row.id %] selected[% END %]>[% HTML.escape(row.projectnumber) %]</option>
-          [%- END %]
-         </select>
-         [%- END %]
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
diff --git a/templates/webpages/do/orders_bottom.html b/templates/webpages/do/orders_bottom.html
new file mode 100644 (file)
index 0000000..4138ca4
--- /dev/null
@@ -0,0 +1,10 @@
+[%- USE T8 %]
+[% USE HTML %]
+ [% 'New invoice' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+ <input type="hidden" name="nextsub" value="invoice_multi">
+ <input type="hidden" name="type" value="[% HTML.escape(type) %]">
+ <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+ <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+ <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+</form>
diff --git a/templates/webpages/do/orders_bottom_de.html b/templates/webpages/do/orders_bottom_de.html
deleted file mode 100644 (file)
index 8026e42..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[% USE HTML %]
- Neue Rechnung<br>
- <input class="submit" type="submit" name="action" value="Weiter">
- <input type="hidden" name="nextsub" value="invoice_multi">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/do/orders_bottom_en.html b/templates/webpages/do/orders_bottom_en.html
deleted file mode 100644 (file)
index 1ce3ad3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[% USE HTML %]
- New invoice<br>
- <input class="submit" type="submit" name="action" value="Continue">
- <input type="hidden" name="nextsub" value="invoice_multi">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/do/orders_bottom_master.html b/templates/webpages/do/orders_bottom_master.html
deleted file mode 100644 (file)
index 24988d7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[% USE HTML %]
- <translate>New invoice</translate><br>
- <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
- <input type="hidden" name="nextsub" value="invoice_multi">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/do/orders_top.html b/templates/webpages/do/orders_top.html
new file mode 100644 (file)
index 0000000..bd402c4
--- /dev/null
@@ -0,0 +1 @@
+<form method="post" action="do.pl">
diff --git a/templates/webpages/do/orders_top_de.html b/templates/webpages/do/orders_top_de.html
deleted file mode 100644 (file)
index bd402c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="do.pl">
diff --git a/templates/webpages/do/orders_top_en.html b/templates/webpages/do/orders_top_en.html
deleted file mode 100644 (file)
index bd402c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="do.pl">
diff --git a/templates/webpages/do/orders_top_master.html b/templates/webpages/do/orders_top_master.html
deleted file mode 100644 (file)
index bd402c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="do.pl">
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
new file mode 100644 (file)
index 0000000..811384c
--- /dev/null
@@ -0,0 +1,243 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body onload="on_load();">
+
+ [%- IF vc == 'customer' %]
+ [%- SET is_customer = '1' %]
+ [%- ELSE %]
+ [%- SET is_customer = '0' %]
+ [%- END %]
+
+ <script type="text/javascript">
+  <!--
+      function on_load() {
+        Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdatefrom_trigger" });
+        Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdateto_trigger" });
+        document.Form.donumber.focus();
+      }
+    -->
+ </script>
+
+ <style type="text/css">
+  .fixed_width {
+    width: 250px;
+  }
+ </style>
+
+ <form method="post" action="do.pl" name="Form">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
+     <td colspan="3">
+      [%- UNLESS SHOW_VC_DROP_DOWN %]
+      <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
+      [%- ELSE %]
+      <select name="[% vc %]" class="fixed_width">
+       <option></option>
+       [%- FOREACH row = ALL_VC %]
+       <option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>
+       [%- END %]
+      </select>
+      <input type="hidden" name="select[% vc %]" value="1">
+      [%- END %]
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Delivery Order Number' | $T8 %]</th>
+     <td colspan="3"><input name="donumber" class="fixed_width"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Order Number' | $T8 %]</th>
+     <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
+    </tr>
+
+    [%- IF ALL_DEPARTMENTS.size %]
+    <tr>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+     <td colspan="3">
+      <select name="department" class="fixed_width">
+       <option></option>
+       [%- FOREACH row = ALL_DEPARTMENTS %]
+       <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+    [%- END %]
+
+    <tr>
+     <th align="right">[% 'Employee' | $T8 %]</th>
+     <td>
+      <select name="employee_id" class="fixed_width">
+       <option></option>
+       [%- FOREACH row = ALL_EMPLOYEES %]
+       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    [%- IF is_customer %]
+    <tr>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
+     <td>
+      <select name="salesman_id" class="fixed_width">
+       <option></option>
+       [%- FOREACH row = ALL_SALESMEN %]
+       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+    [%- END %]
+
+    <tr>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
+     <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Customer Order Number' | $T8 %]</th>
+     <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
+     <td colspan="3">
+      <select name="project_id" class="fixed_width">
+       <option></option>
+       [%- FOREACH row = ALL_PROJECTS %]
+       <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.projectnumber) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'From' | $T8 %]</th>
+     <td>
+      <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
+      <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
+     </td>
+     <th align="right">[% 'Bis' | $T8 %]</th>
+     <td>
+      <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
+      <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
+     <td colspan="5">
+      <table>
+       <tr>
+        <td>
+         <input type="checkbox" name="open" value="1" id="open" checked>
+         <label for="open">[% 'Open' | $T8 %]</label>
+        </td>
+        <td>
+         <input type="checkbox" name="closed" value="1" id="closed">
+         <label for="closed">[% 'Closed' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label></td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
+         <label for="l_id">[% 'ID' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_donumber">[% 'Delivery Order Number' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
+        </td>
+       </tr>
+
+      </table>
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <p>
+   <input type="hidden" name="nextsub" value="orders">
+   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
+
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
+
diff --git a/templates/webpages/do/search_de.html b/templates/webpages/do/search_de.html
deleted file mode 100644 (file)
index 0ad75a0..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load();">
-
- [%- IF vc == 'customer' %]
- [%- SET is_customer = '1' %]
- [%- ELSE %]
- [%- SET is_customer = '0' %]
- [%- END %]
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdatefrom_trigger" });
-        Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdateto_trigger" });
-        document.Form.donumber.focus();
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
-     <td colspan="3">
-      [%- UNLESS SHOW_VC_DROP_DOWN %]
-      <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
-      [%- ELSE %]
-      <select name="[% vc %]" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_VC %]
-       <option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-      <input type="hidden" name="select[% vc %]" value="1">
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">Lieferscheinnummer</th>
-     <td colspan="3"><input name="donumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Auftragsnummer</th>
-     <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
-    </tr>
-
-    [%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap>Abteilung</th>
-     <td colspan="3">
-      <select name="department" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_DEPARTMENTS %]
-       <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right">Bearbeiter</th>
-     <td>
-      <select name="employee_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    [%- IF is_customer %]
-    <tr>
-     <th align="right">Verkäufer/in</th>
-     <td>
-      <select name="salesman_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_SALESMEN %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right">Vorgangsbezeichnung</th>
-     <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Bestellnummer des Kunden</th>
-     <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Projektnummer</th>
-     <td colspan="3">
-      <select name="project_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_PROJECTS %]
-       <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.projectnumber) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">Von</th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
-     </td>
-     <th align="right">bis</th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">In Bericht aufnehmen</th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Offen</label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Geschlossen</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Nicht geliefert</label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Geliefert</label></td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">Buchungsnummer</label>
-        </td>
-
-        <td>
-         <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_donumber">Lieferscheinnummer</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_ordnumber">Auftragsnummer</label>
-        </td>
-
-        <td>
-         <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_cusordnumber">Bestellnummer des Kunden</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Datum</label>
-        </td>
-
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Bearbeiter</label>
-        </td>
-
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Verkäufer/in</label>
-        </td>
-
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Transportmittel</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Projektnummer</label>
-        </td>
-
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Vorgangsbezeichnung</label>
-        </td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="hidden" name="nextsub" value="orders">
-   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-
-   <input class="submit" type="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/search_en.html b/templates/webpages/do/search_en.html
deleted file mode 100644 (file)
index c8477cc..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load();">
-
- [%- IF vc == 'customer' %]
- [%- SET is_customer = '1' %]
- [%- ELSE %]
- [%- SET is_customer = '0' %]
- [%- END %]
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdatefrom_trigger" });
-        Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdateto_trigger" });
-        document.Form.donumber.focus();
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right">[% IF is_customer %]Customer[% ELSE %]Vendor[% END %]</th>
-     <td colspan="3">
-      [%- UNLESS SHOW_VC_DROP_DOWN %]
-      <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
-      [%- ELSE %]
-      <select name="[% vc %]" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_VC %]
-       <option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-      <input type="hidden" name="select[% vc %]" value="1">
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">Delivery Order Number</th>
-     <td colspan="3"><input name="donumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Order Number</th>
-     <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
-    </tr>
-
-    [%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap>Department</th>
-     <td colspan="3">
-      <select name="department" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_DEPARTMENTS %]
-       <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right">Employee</th>
-     <td>
-      <select name="employee_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    [%- IF is_customer %]
-    <tr>
-     <th align="right">Salesman</th>
-     <td>
-      <select name="salesman_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_SALESMEN %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right">Transaction description</th>
-     <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Customer Order Number</th>
-     <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Project Number</th>
-     <td colspan="3">
-      <select name="project_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_PROJECTS %]
-       <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.projectnumber) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">From</th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
-     </td>
-     <th align="right">Bis</th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right">Include in Report</th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Open</label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Closed</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Not delivered</label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Delivered</label></td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">ID</label>
-        </td>
-
-        <td>
-         <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_donumber">Delivery Order Number</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_ordnumber">Order Number</label>
-        </td>
-
-        <td>
-         <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_cusordnumber">Customer Order Number</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Date</label>
-        </td>
-
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% IF is_customer %]Customer[% ELSE %]Vendor[% END %]</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Employee</label>
-        </td>
-
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Salesman</label>
-        </td>
-
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Ship via</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Project Number</label>
-        </td>
-
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Transaction description</label>
-        </td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="hidden" name="nextsub" value="orders">
-   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-
-   <input class="submit" type="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/search_master.html b/templates/webpages/do/search_master.html
deleted file mode 100644 (file)
index 1875911..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body onload="on_load();">
-
- [%- IF vc == 'customer' %]
- [%- SET is_customer = '1' %]
- [%- ELSE %]
- [%- SET is_customer = '0' %]
- [%- END %]
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdatefrom_trigger" });
-        Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdateto_trigger" });
-        document.Form.donumber.focus();
-      }
-    -->
- </script>
-
- <style type="text/css">
-  .fixed_width {
-    width: 250px;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
-     <td colspan="3">
-      [%- UNLESS SHOW_VC_DROP_DOWN %]
-      <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
-      [%- ELSE %]
-      <select name="[% vc %]" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_VC %]
-       <option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-      <input type="hidden" name="select[% vc %]" value="1">
-      [%- END %]
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Delivery Order Number</translate></th>
-     <td colspan="3"><input name="donumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Order Number</translate></th>
-     <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
-    </tr>
-
-    [%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap><translate>Department</translate></th>
-     <td colspan="3">
-      <select name="department" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_DEPARTMENTS %]
-       <option[% IF department == row.value %] selected[% END %]>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right"><translate>Employee</translate></th>
-     <td>
-      <select name="employee_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    [%- IF is_customer %]
-    <tr>
-     <th align="right"><translate>Salesman</translate></th>
-     <td>
-      <select name="salesman_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_SALESMEN %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-    [%- END %]
-
-    <tr>
-     <th align="right"><translate>Transaction description</translate></th>
-     <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Customer Order Number</translate></th>
-     <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Project Number</translate></th>
-     <td colspan="3">
-      <select name="project_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_PROJECTS %]
-       <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.projectnumber) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>From</translate></th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
-     </td>
-     <th align="right"><translate>Bis</translate></th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Include in Report</translate></th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open"><translate>Open</translate></label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed"><translate>Closed</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered"><translate>Not delivered</translate></label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered"><translate>Delivered</translate></label></td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id"><translate>ID</translate></label>
-        </td>
-
-        <td>
-         <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_donumber"><translate>Delivery Order Number</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_ordnumber"><translate>Order Number</translate></label>
-        </td>
-
-        <td>
-         <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_cusordnumber"><translate>Customer Order Number</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate"><translate>Date</translate></label>
-        </td>
-
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee"><translate>Employee</translate></label>
-        </td>
-
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman"><translate>Salesman</translate></label>
-        </td>
-
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia"><translate>Ship via</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber"><translate>Project Number</translate></label>
-        </td>
-
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description"><translate>Transaction description</translate></label>
-        </td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="hidden" name="nextsub" value="orders">
-   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/set_stock_in_out.html b/templates/webpages/do/set_stock_in_out.html
new file mode 100644 (file)
index 0000000..36bbf7f
--- /dev/null
@@ -0,0 +1,24 @@
+[% USE HTML %]<body onload="on_load();">
+
+ <script type="text/javascript">
+  <!--
+      function on_load() {
+        var row    = document.getElementsByName("row")[0].value;
+        var stock  = document.getElementsByName("stock")[0].value;
+        var in_out = document.getElementsByName("in_out")[0].value;
+
+        window.opener.document.getElementsByName("stock_" + in_out + "_" + row)[0].value = stock;
+
+        window.close();
+      }
+    -->
+ </script>
+
+ <form name="data">
+  <input type="hidden" name="row" value="[% HTML.escape(row) %]">
+  <input type="hidden" name="stock" value="[% HTML.escape(stock) %]">
+  <input type="hidden" name="in_out" value="[% HTML.escape(in_out) %]">
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/do/set_stock_in_out_de.html b/templates/webpages/do/set_stock_in_out_de.html
deleted file mode 100644 (file)
index 36bbf7f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        var row    = document.getElementsByName("row")[0].value;
-        var stock  = document.getElementsByName("stock")[0].value;
-        var in_out = document.getElementsByName("in_out")[0].value;
-
-        window.opener.document.getElementsByName("stock_" + in_out + "_" + row)[0].value = stock;
-
-        window.close();
-      }
-    -->
- </script>
-
- <form name="data">
-  <input type="hidden" name="row" value="[% HTML.escape(row) %]">
-  <input type="hidden" name="stock" value="[% HTML.escape(stock) %]">
-  <input type="hidden" name="in_out" value="[% HTML.escape(in_out) %]">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/set_stock_in_out_en.html b/templates/webpages/do/set_stock_in_out_en.html
deleted file mode 100644 (file)
index 36bbf7f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        var row    = document.getElementsByName("row")[0].value;
-        var stock  = document.getElementsByName("stock")[0].value;
-        var in_out = document.getElementsByName("in_out")[0].value;
-
-        window.opener.document.getElementsByName("stock_" + in_out + "_" + row)[0].value = stock;
-
-        window.close();
-      }
-    -->
- </script>
-
- <form name="data">
-  <input type="hidden" name="row" value="[% HTML.escape(row) %]">
-  <input type="hidden" name="stock" value="[% HTML.escape(stock) %]">
-  <input type="hidden" name="in_out" value="[% HTML.escape(in_out) %]">
- </form>
-
-</body>
-</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 (file)
index 36bbf7f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        var row    = document.getElementsByName("row")[0].value;
-        var stock  = document.getElementsByName("stock")[0].value;
-        var in_out = document.getElementsByName("in_out")[0].value;
-
-        window.opener.document.getElementsByName("stock_" + in_out + "_" + row)[0].value = stock;
-
-        window.close();
-      }
-    -->
- </script>
-
- <form name="data">
-  <input type="hidden" name="row" value="[% HTML.escape(row) %]">
-  <input type="hidden" name="stock" value="[% HTML.escape(stock) %]">
-  <input type="hidden" name="in_out" value="[% HTML.escape(in_out) %]">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/do/stock_in_form.html b/templates/webpages/do/stock_in_form.html
new file mode 100644 (file)
index 0000000..238747e
--- /dev/null
@@ -0,0 +1,184 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
+
+ [%- UNLESS delivered %]
+ <script type="text/javascript">
+  <!--
+      warehouses = new Array();
+      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(row, index, initial_bin_index) {
+        var cname = "bin_id_" + row;
+        var control = document.getElementById(cname);
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        for (i = 0; i < warehouses[index].length; i++) {
+          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
+        }
+
+        if (!initial_bin_index)
+          initial_bin_index = 0;
+        control.options[initial_bin_index].selected = true;
+      }
+
+      function on_load() {
+        [%- USE STOCK_INFO_it = Iterator(STOCK_INFO) %][%- FOREACH si = STOCK_INFO_it %]
+          // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
+          [%- SET warehouse_selected = '0' %]
+          [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH wh = WAREHOUSES_it %]
+            // wh [% wh.id %]
+            [%- USE BINS_it = Iterator(wh.BINS) %][%- FOREACH bin = BINS_it %]
+              // bin [% bin.id %]
+              [%- IF bin.id == si.bin_id %]
+                warehouse_selected([% STOCK_INFO_it.count %], [% WAREHOUSES_it.count - 1 %], [% BINS_it.count - 1%]);
+                [%- SET warehouse_selected = '1' %]
+              [%- END %]
+            [%- END %]
+          [%- END %]
+          [%- UNLESS warehouse_selected %]
+          warehouse_selected([% STOCK_INFO_it.count %], 0);
+          [%- END %]
+        [%- END %]
+      }
+    -->
+ </script>
+ [%- END %]
+
+ <form method="post" action="do.pl" name="Form">
+
+  <div class="listtop">[% title %]</div>
+
+  [%- IF ERRORS && ERRORS.size %]
+  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
+  [%- END %]
+
+  <p>
+   <table>
+    <tr>
+     <td>[% 'Part Number' | $T8 %]</td>
+     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Description' | $T8 %]</td>
+     <td>[% HTML.escape(PART_INFO.description) %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
+     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
+    </tr>
+   </table>
+  </p>
+
+  <input type="hidden" name="nextsub"        value="set_stock_in">
+  <input type="hidden" name="update_nextsub" value="update_stock_in">
+  <input type="hidden" name="rowcount"       value="[% HTML.escape(STOCK_INFO.size) %]">
+  <input type="hidden" name="in_out"         value="in">
+  <input type="hidden" name="parts_id"       value="[% HTML.escape(parts_id) %]">
+  <input type="hidden" name="partunit"       value="[% HTML.escape(PART_INFO.unit) %]">
+  <input type="hidden" name="do_qty"         value="[% HTML.escape(do_qty) %]">
+  <input type="hidden" name="do_unit"        value="[% HTML.escape(do_unit) %]">
+  <input type="hidden" name="row"            value="[% HTML.escape(row) %]">
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th class="listheading">&nbsp;</th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH row = STOCK_INFO %]
+    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
+     <td>[% loop.count %]</td>
+
+     [%- IF delivered %]
+
+     <td>[% HTML.escape(row.warehouse_description) %]</td>
+     <td>[% HTML.escape(row.bin_description) %]</td>
+     <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
+     <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
+     <td>[% HTML.escape(row.unit) %]</td>
+
+     [%- ELSE %]
+
+     <td>
+      <select name="warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
+       [%- FOREACH wh = WAREHOUSES %]
+       <option value="[% HTML.escape(wh.id) %]"[% IF wh.id == row.warehouse_id %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
+       [%- END %]
+      </select>
+     </td>
+
+     <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
+     <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
+     [% IF conf_show_best_before %]
+     <td>
+       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
+     </td>
+     [% END %]
+     <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
+
+     <td>
+      <select name="unit_[% loop.count %]">
+       [%- FOREACH unit = UNITS %]
+       <option[% IF unit.name == row.unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+
+     [%- END %]
+    </tr>
+
+    [%- END %]
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <p>
+   [%- IF delivered %]
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
+   [%- ELSE %]
+   <input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+   [%- END %]
+  </p>
+ </form>
+
+ [%- IF NOT delivered %]
+ [% IF conf_show_best_before %]
+  <script type="text/javascript">
+    <!--
+    [%- FOREACH row = STOCK_INFO %]
+    Calendar.setup( {
+      inputField : "bestbefore_[% loop.count %]",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger_[% loop.count %]"
+    });
+    [%- END %]
+    //-->
+  </script>
+  [% END %]
+  [%- END %]
+
+</body>
+</html>
+
diff --git a/templates/webpages/do/stock_in_form_de.html b/templates/webpages/do/stock_in_form_de.html
deleted file mode 100644 (file)
index 1db223d..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
-
- [%- UNLESS delivered %]
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index, initial_bin_index) {
-        var cname = "bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        if (!initial_bin_index)
-          initial_bin_index = 0;
-        control.options[initial_bin_index].selected = true;
-      }
-
-      function on_load() {
-        [%- USE STOCK_INFO_it = Iterator(STOCK_INFO) %][%- FOREACH si = STOCK_INFO_it %]
-          // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
-          [%- SET warehouse_selected = '0' %]
-          [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH wh = WAREHOUSES_it %]
-            // wh [% wh.id %]
-            [%- USE BINS_it = Iterator(wh.BINS) %][%- FOREACH bin = BINS_it %]
-              // bin [% bin.id %]
-              [%- IF bin.id == si.bin_id %]
-                warehouse_selected([% STOCK_INFO_it.count %], [% WAREHOUSES_it.count - 1 %], [% BINS_it.count - 1%]);
-                [%- SET warehouse_selected = '1' %]
-              [%- END %]
-            [%- END %]
-          [%- END %]
-          [%- UNLESS warehouse_selected %]
-          warehouse_selected([% STOCK_INFO_it.count %], 0);
-          [%- END %]
-        [%- END %]
-      }
-    -->
- </script>
- [%- END %]
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td>Artikelnummer</td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td>Beschreibung</td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td>Menge laut Lieferschein</td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  <input type="hidden" name="nextsub"        value="set_stock_in">
-  <input type="hidden" name="update_nextsub" value="update_stock_in">
-  <input type="hidden" name="rowcount"       value="[% HTML.escape(STOCK_INFO.size) %]">
-  <input type="hidden" name="in_out"         value="in">
-  <input type="hidden" name="parts_id"       value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"       value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"         value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"        value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"            value="[% HTML.escape(row) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Lager</th>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Chargennummer</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
-     [% END %]
-     <th align="right" class="listheading">Menge</th>
-     <th align="right" class="listheading">Einheit</th>
-    </tr>
-
-    [%- FOREACH row = STOCK_INFO %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(row.warehouse_description) %]</td>
-     <td>[% HTML.escape(row.bin_description) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
-     <td>[% HTML.escape(row.unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>
-      <select name="warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [%- FOREACH wh = WAREHOUSES %]
-       <option value="[% HTML.escape(wh.id) %]"[% IF wh.id == row.warehouse_id %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
-     <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
-     [% IF conf_show_best_before %]
-     <td>
-       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
-     </td>
-     [% END %]
-     <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
-
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Erneuern">
-   <input class="submit" type="submit" name="action" value="Weiter">
-   [%- END %]
-  </p>
- </form>
-
- [%- IF NOT delivered %]
- [% IF conf_show_best_before %]
-  <script type="text/javascript">
-    <!--
-    [%- FOREACH row = STOCK_INFO %]
-    Calendar.setup( {
-      inputField : "bestbefore_[% loop.count %]",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger_[% loop.count %]"
-    });
-    [%- END %]
-    //-->
-  </script>
-  [% END %]
-  [%- END %]
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/stock_in_form_en.html b/templates/webpages/do/stock_in_form_en.html
deleted file mode 100644 (file)
index 277c7e4..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
-
- [%- UNLESS delivered %]
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index, initial_bin_index) {
-        var cname = "bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        if (!initial_bin_index)
-          initial_bin_index = 0;
-        control.options[initial_bin_index].selected = true;
-      }
-
-      function on_load() {
-        [%- USE STOCK_INFO_it = Iterator(STOCK_INFO) %][%- FOREACH si = STOCK_INFO_it %]
-          // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
-          [%- SET warehouse_selected = '0' %]
-          [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH wh = WAREHOUSES_it %]
-            // wh [% wh.id %]
-            [%- USE BINS_it = Iterator(wh.BINS) %][%- FOREACH bin = BINS_it %]
-              // bin [% bin.id %]
-              [%- IF bin.id == si.bin_id %]
-                warehouse_selected([% STOCK_INFO_it.count %], [% WAREHOUSES_it.count - 1 %], [% BINS_it.count - 1%]);
-                [%- SET warehouse_selected = '1' %]
-              [%- END %]
-            [%- END %]
-          [%- END %]
-          [%- UNLESS warehouse_selected %]
-          warehouse_selected([% STOCK_INFO_it.count %], 0);
-          [%- END %]
-        [%- END %]
-      }
-    -->
- </script>
- [%- END %]
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td>Part Number</td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td>Description</td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td>Qty according to delivery order</td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  <input type="hidden" name="nextsub"        value="set_stock_in">
-  <input type="hidden" name="update_nextsub" value="update_stock_in">
-  <input type="hidden" name="rowcount"       value="[% HTML.escape(STOCK_INFO.size) %]">
-  <input type="hidden" name="in_out"         value="in">
-  <input type="hidden" name="parts_id"       value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"       value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"         value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"        value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"            value="[% HTML.escape(row) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Warehouse</th>
-     <th class="listheading">Bin</th>
-     <th class="listheading">Charge Number</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Best Before</th>
-     [% END %]
-     <th align="right" class="listheading">Qty</th>
-     <th align="right" class="listheading">Unit</th>
-    </tr>
-
-    [%- FOREACH row = STOCK_INFO %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(row.warehouse_description) %]</td>
-     <td>[% HTML.escape(row.bin_description) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
-     <td>[% HTML.escape(row.unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>
-      <select name="warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [%- FOREACH wh = WAREHOUSES %]
-       <option value="[% HTML.escape(wh.id) %]"[% IF wh.id == row.warehouse_id %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
-     <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
-     [% IF conf_show_best_before %]
-     <td>
-       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
-     </td>
-     [% END %]
-     <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
-
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Close Window</button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Update">
-   <input class="submit" type="submit" name="action" value="Continue">
-   [%- END %]
-  </p>
- </form>
-
- [%- IF NOT delivered %]
- [% IF conf_show_best_before %]
-  <script type="text/javascript">
-    <!--
-    [%- FOREACH row = STOCK_INFO %]
-    Calendar.setup( {
-      inputField : "bestbefore_[% loop.count %]",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger_[% loop.count %]"
-    });
-    [%- END %]
-    //-->
-  </script>
-  [% END %]
-  [%- END %]
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
deleted file mode 100644 (file)
index e8c411b..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
-
- [%- UNLESS delivered %]
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index, initial_bin_index) {
-        var cname = "bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        if (!initial_bin_index)
-          initial_bin_index = 0;
-        control.options[initial_bin_index].selected = true;
-      }
-
-      function on_load() {
-        [%- USE STOCK_INFO_it = Iterator(STOCK_INFO) %][%- FOREACH si = STOCK_INFO_it %]
-          // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
-          [%- SET warehouse_selected = '0' %]
-          [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH wh = WAREHOUSES_it %]
-            // wh [% wh.id %]
-            [%- USE BINS_it = Iterator(wh.BINS) %][%- FOREACH bin = BINS_it %]
-              // bin [% bin.id %]
-              [%- IF bin.id == si.bin_id %]
-                warehouse_selected([% STOCK_INFO_it.count %], [% WAREHOUSES_it.count - 1 %], [% BINS_it.count - 1%]);
-                [%- SET warehouse_selected = '1' %]
-              [%- END %]
-            [%- END %]
-          [%- END %]
-          [%- UNLESS warehouse_selected %]
-          warehouse_selected([% STOCK_INFO_it.count %], 0);
-          [%- END %]
-        [%- END %]
-      }
-    -->
- </script>
- [%- END %]
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td><translate>Part Number</translate></td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td><translate>Description</translate></td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td><translate>Qty according to delivery order</translate></td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  <input type="hidden" name="nextsub"        value="set_stock_in">
-  <input type="hidden" name="update_nextsub" value="update_stock_in">
-  <input type="hidden" name="rowcount"       value="[% HTML.escape(STOCK_INFO.size) %]">
-  <input type="hidden" name="in_out"         value="in">
-  <input type="hidden" name="parts_id"       value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"       value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"         value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"        value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"            value="[% HTML.escape(row) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Warehouse</translate></th>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
-     [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
-     [% END %]
-     <th align="right" class="listheading"><translate>Qty</translate></th>
-     <th align="right" class="listheading"><translate>Unit</translate></th>
-    </tr>
-
-    [%- FOREACH row = STOCK_INFO %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(row.warehouse_description) %]</td>
-     <td>[% HTML.escape(row.bin_description) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
-     <td>[% HTML.escape(row.unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>
-      <select name="warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [%- FOREACH wh = WAREHOUSES %]
-       <option value="[% HTML.escape(wh.id) %]"[% IF wh.id == row.warehouse_id %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
-     <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
-     [% IF conf_show_best_before %]
-     <td>
-       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
-     </td>
-     [% END %]
-     <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
-
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Update</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-   [%- END %]
-  </p>
- </form>
-
- [%- IF NOT delivered %]
- [% IF conf_show_best_before %]
-  <script type="text/javascript">
-    <!--
-    [%- FOREACH row = STOCK_INFO %]
-    Calendar.setup( {
-      inputField : "bestbefore_[% loop.count %]",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger_[% loop.count %]"
-    });
-    [%- END %]
-    //-->
-  </script>
-  [% END %]
-  [%- END %]
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/stock_out_form.html b/templates/webpages/do/stock_out_form.html
new file mode 100644 (file)
index 0000000..f9ffbba
--- /dev/null
@@ -0,0 +1,134 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+
+ [%- IF delivered %]
+ [%- SET RO = ' readonly' %]
+ [%- END %]
+
+ <style type="text/css">
+  .tr_error {
+    background-color: #ffc9c9;
+  }
+ </style>
+
+ <form method="post" action="do.pl" name="Form">
+
+  <div class="listtop">[% title %]</div>
+
+  [%- IF ERRORS && ERRORS.size %]
+  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
+  [%- END %]
+
+  <p>
+   <table>
+    <tr>
+     <td>[% 'Part Number' | $T8 %]</td>
+     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Description' | $T8 %]</td>
+     <td>[% HTML.escape(PART_INFO.description) %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
+     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
+    </tr>
+   </table>
+  </p>
+
+  [%- UNLESS WHCONTENTS.size %]
+  <p>[% 'There are no items in stock.' | $T8 %]</p>
+
+  <p><button type="button" onclick="window.close()">[% 'Close Window' | $T8 %]</button></p>
+
+  [%- ELSE %]
+
+  <input type="hidden" name="nextsub"   value="set_stock_out">
+  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
+  <input type="hidden" name="in_out"    value="out">
+  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
+  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
+  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
+  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
+  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
+  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th class="listheading">&nbsp;</th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     [%- UNLESS delivered %]
+     <th align="right" class="listheading">[% 'Available qty' | $T8 %]</th>
+     [%- END %]
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH row = WHCONTENTS %]
+    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
+     <td>[% loop.count %]</td>
+     <td>[% HTML.escape(row.warehousedescription) %]</td>
+     <td>[% HTML.escape(row.bindescription) %]</td>
+     <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
+     [%- IF delivered %]
+
+     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
+     <td>[% HTML.escape(row.stock_unit) %]</td>
+
+     [%- ELSE %]
+
+     <td>[% HTML.escape(row.available_qty) %]</td>
+     <td><input name="qty_[% loop.count %]" style="text-align: right;" size="12"
+                [%- IF row.stock_qty %]
+                value="[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]"
+                [%- ELSIF ((WHCONTENTS.size == 1) && (!row.stock_qty)) %]
+                value="[% HTML.escape(do_qty) %]"
+                [%- END %]
+                ></td>
+     <td>
+      <select name="unit_[% loop.count %]">
+       [%- FOREACH unit = UNITS %]
+       <option[% IF unit.name == row.stock_unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+
+     [%- END %]
+    </tr>
+
+    <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
+    <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
+    <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+    [% IF conf_show_best_before %]
+    <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+    [% END %]
+    [%- END %]
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <p>
+   [%- IF delivered %]
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
+   [%- ELSE %]
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+   [%- END %]
+  </p>
+
+  [%- END %]
+ </form>
+
+</body>
+</html>
+
diff --git a/templates/webpages/do/stock_out_form_de.html b/templates/webpages/do/stock_out_form_de.html
deleted file mode 100644 (file)
index a182da5..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
- <style type="text/css">
-  .tr_error {
-    background-color: #ffc9c9;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td>Artikelnummer</td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td>Beschreibung</td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td>Menge laut Lieferschein</td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  [%- UNLESS WHCONTENTS.size %]
-  <p>Dieser Artikel ist nicht eingelagert.</p>
-
-  <p><button type="button" onclick="window.close()">Fenster Schlie&szlig;en</button></p>
-
-  [%- ELSE %]
-
-  <input type="hidden" name="nextsub"   value="set_stock_out">
-  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
-  <input type="hidden" name="in_out"    value="out">
-  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
-  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Lager</th>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Chargennummer</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
-     [% END %]
-     [%- UNLESS delivered %]
-     <th align="right" class="listheading">Lagerbestand</th>
-     [%- END %]
-     <th align="right" class="listheading">Menge</th>
-     <th align="right" class="listheading">Einheit</th>
-    </tr>
-
-    [%- FOREACH row = WHCONTENTS %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-     <td>[% HTML.escape(row.warehousedescription) %]</td>
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
-     <td>[% HTML.escape(row.stock_unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>[% HTML.escape(row.available_qty) %]</td>
-     <td><input name="qty_[% loop.count %]" style="text-align: right;" size="12"
-                [%- IF row.stock_qty %]
-                value="[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]"
-                [%- ELSIF ((WHCONTENTS.size == 1) && (!row.stock_qty)) %]
-                value="[% HTML.escape(do_qty) %]"
-                [%- END %]
-                ></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.stock_unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
-    <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
-    <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-    [% IF conf_show_best_before %]
-    <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-    [% END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Weiter">
-   [%- END %]
-  </p>
-
-  [%- END %]
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/stock_out_form_en.html b/templates/webpages/do/stock_out_form_en.html
deleted file mode 100644 (file)
index a1c7ce3..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
- <style type="text/css">
-  .tr_error {
-    background-color: #ffc9c9;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td>Part Number</td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td>Description</td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td>Qty according to delivery order</td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  [%- UNLESS WHCONTENTS.size %]
-  <p>There are no items in stock.</p>
-
-  <p><button type="button" onclick="window.close()">Close Window</button></p>
-
-  [%- ELSE %]
-
-  <input type="hidden" name="nextsub"   value="set_stock_out">
-  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
-  <input type="hidden" name="in_out"    value="out">
-  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
-  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Warehouse</th>
-     <th class="listheading">Bin</th>
-     <th class="listheading">Charge Number</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Best Before</th>
-     [% END %]
-     [%- UNLESS delivered %]
-     <th align="right" class="listheading">Available qty</th>
-     [%- END %]
-     <th align="right" class="listheading">Qty</th>
-     <th align="right" class="listheading">Unit</th>
-    </tr>
-
-    [%- FOREACH row = WHCONTENTS %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-     <td>[% HTML.escape(row.warehousedescription) %]</td>
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
-     <td>[% HTML.escape(row.stock_unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>[% HTML.escape(row.available_qty) %]</td>
-     <td><input name="qty_[% loop.count %]" style="text-align: right;" size="12"
-                [%- IF row.stock_qty %]
-                value="[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]"
-                [%- ELSIF ((WHCONTENTS.size == 1) && (!row.stock_qty)) %]
-                value="[% HTML.escape(do_qty) %]"
-                [%- END %]
-                ></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.stock_unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
-    <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
-    <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-    [% IF conf_show_best_before %]
-    <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-    [% END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Close Window</button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Continue">
-   [%- END %]
-  </p>
-
-  [%- END %]
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/do/stock_out_form_master.html b/templates/webpages/do/stock_out_form_master.html
deleted file mode 100644 (file)
index e8f7a13..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
-
- <style type="text/css">
-  .tr_error {
-    background-color: #ffc9c9;
-  }
- </style>
-
- <form method="post" action="do.pl" name="Form">
-
-  <div class="listtop">[% title %]</div>
-
-  [%- IF ERRORS && ERRORS.size %]
-  <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
-  [%- END %]
-
-  <p>
-   <table>
-    <tr>
-     <td><translate>Part Number</translate></td>
-     <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
-    </tr>
-    <tr>
-     <td><translate>Description</translate></td>
-     <td>[% HTML.escape(PART_INFO.description) %]</td>
-    </tr>
-    <tr>
-     <td><translate>Qty according to delivery order</translate></td>
-     <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
-    </tr>
-   </table>
-  </p>
-
-  [%- UNLESS WHCONTENTS.size %]
-  <p><translate>There are no items in stock.</translate></p>
-
-  <p><button type="button" onclick="window.close()"><translate>Close Window</translate></button></p>
-
-  [%- ELSE %]
-
-  <input type="hidden" name="nextsub"   value="set_stock_out">
-  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
-  <input type="hidden" name="in_out"    value="out">
-  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
-  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
-  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Warehouse</translate></th>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
-     [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
-     [% END %]
-     [%- UNLESS delivered %]
-     <th align="right" class="listheading"><translate>Available qty</translate></th>
-     [%- END %]
-     <th align="right" class="listheading"><translate>Qty</translate></th>
-     <th align="right" class="listheading"><translate>Unit</translate></th>
-    </tr>
-
-    [%- FOREACH row = WHCONTENTS %]
-    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
-     <td>[% loop.count %]</td>
-     <td>[% HTML.escape(row.warehousedescription) %]</td>
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     [%- IF delivered %]
-
-     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
-     <td>[% HTML.escape(row.stock_unit) %]</td>
-
-     [%- ELSE %]
-
-     <td>[% HTML.escape(row.available_qty) %]</td>
-     <td><input name="qty_[% loop.count %]" style="text-align: right;" size="12"
-                [%- IF row.stock_qty %]
-                value="[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]"
-                [%- ELSIF ((WHCONTENTS.size == 1) && (!row.stock_qty)) %]
-                value="[% HTML.escape(do_qty) %]"
-                [%- END %]
-                ></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.stock_unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
-       [%- END %]
-      </select>
-     </td>
-
-     [%- END %]
-    </tr>
-
-    <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
-    <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
-    <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-    [% IF conf_show_best_before %]
-    <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-    [% END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
-   [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-   [%- END %]
-  </p>
-
-  [%- END %]
- </form>
-
-</body>
-</html>
-
diff --git a/templates/webpages/drafts/load.html b/templates/webpages/drafts/load.html
new file mode 100644 (file)
index 0000000..13aae21
--- /dev/null
@@ -0,0 +1,53 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <form action="[% HTML.escape(script) %]" method="post">
+
+  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
+
+  <table width="100%">
+   <tr>
+    <th class="listtop">[% 'Load draft' | $T8 %]</th>
+   </tr>
+   <tr height="5"></tr>
+
+   <tr>
+    <td>
+     [% 'The following drafts have been saved and can be loaded.' | $T8 %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>
+     <table>
+      <tr>
+       <th class="listheading">&nbsp;</th>
+       <th class="listheading">[% 'Date' | $T8 %]</th>
+       <th class="listheading">[% 'Description' | $T8 %]</th>
+       <th class="listheading">[% 'Employee' | $T8 %]</th>
+      </tr>
+
+      [% FOREACH row = DRAFTS %]
+       <tr class="listrow[% loop.count % 2 %]">
+        <td><input type="checkbox" name="checked_[% row.id %]" value="1"></td>
+        <td>[% HTML.escape(row.itime) %]</td>
+        <td><a href="[% HTML.url(script) %]?action=load_draft&id=[% HTML.url(row.id) %]">[% HTML.escape(row.description) %]</a></td>
+        <td>[% HTML.escape(row.employee_name) %]</td>
+       </tr>
+      [% END %]
+     </table>
+    </td>
+   </tr>
+
+   <tr>
+    <td>
+     <input type="hidden" name="action" value="draft_action_dispatcher">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Skip' | $T8 %]">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Delete drafts' | $T8 %]">
+    </td>
+   </tr>
+  </table>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/drafts/load_de.html b/templates/webpages/drafts/load_de.html
deleted file mode 100644 (file)
index 49e22cf..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">Entwurf laden</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     Die folgenden Entw&uuml;rfe wurden gespeichert und k&ouml;nnen geladen werden.
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th class="listheading">&nbsp;</th>
-       <th class="listheading">Datum</th>
-       <th class="listheading">Beschreibung</th>
-       <th class="listheading">Bearbeiter</th>
-      </tr>
-
-      [% FOREACH row = DRAFTS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td><input type="checkbox" name="checked_[% row.id %]" value="1"></td>
-        <td>[% HTML.escape(row.itime) %]</td>
-        <td><a href="[% HTML.url(script) %]?action=load_draft&id=[% HTML.url(row.id) %]">[% HTML.escape(row.description) %]</a></td>
-        <td>[% HTML.escape(row.employee_name) %]</td>
-       </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="hidden" name="action" value="draft_action_dispatcher">
-     <input type="submit" class="submit" name="draft_action" value="Überspringen">
-     <input type="submit" class="submit" name="draft_action" value="Entwürfe löschen">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/drafts/load_en.html b/templates/webpages/drafts/load_en.html
deleted file mode 100644 (file)
index 0de4477..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">Load draft</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     The following drafts have been saved and can be loaded.
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th class="listheading">&nbsp;</th>
-       <th class="listheading">Date</th>
-       <th class="listheading">Description</th>
-       <th class="listheading">Employee</th>
-      </tr>
-
-      [% FOREACH row = DRAFTS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td><input type="checkbox" name="checked_[% row.id %]" value="1"></td>
-        <td>[% HTML.escape(row.itime) %]</td>
-        <td><a href="[% HTML.url(script) %]?action=load_draft&id=[% HTML.url(row.id) %]">[% HTML.escape(row.description) %]</a></td>
-        <td>[% HTML.escape(row.employee_name) %]</td>
-       </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="hidden" name="action" value="draft_action_dispatcher">
-     <input type="submit" class="submit" name="draft_action" value="Skip">
-     <input type="submit" class="submit" name="draft_action" value="Delete drafts">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html
deleted file mode 100644 (file)
index cc80110..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop"><translate>Load draft</translate></th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     <translate>The following drafts have been saved and can be loaded.</translate>
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th class="listheading">&nbsp;</th>
-       <th class="listheading"><translate>Date</translate></th>
-       <th class="listheading"><translate>Description</translate></th>
-       <th class="listheading"><translate>Employee</translate></th>
-      </tr>
-
-      [% FOREACH row = DRAFTS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td><input type="checkbox" name="checked_[% row.id %]" value="1"></td>
-        <td>[% HTML.escape(row.itime) %]</td>
-        <td><a href="[% HTML.url(script) %]?action=load_draft&id=[% HTML.url(row.id) %]">[% HTML.escape(row.description) %]</a></td>
-        <td>[% HTML.escape(row.employee_name) %]</td>
-       </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="hidden" name="action" value="draft_action_dispatcher">
-     <input type="submit" class="submit" name="draft_action" value="<translate>Skip</translate>">
-     <input type="submit" class="submit" name="draft_action" value="<translate>Delete drafts</translate>">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/drafts/save_new.html b/templates/webpages/drafts/save_new.html
new file mode 100644 (file)
index 0000000..aaf04ac
--- /dev/null
@@ -0,0 +1,34 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <form action="[% HTML.escape(script) %]" method="post">
+
+  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
+
+  <table width="100%">
+   <tr>
+    <th class="listtop">[% 'Save draft' | $T8 %]</th>
+   </tr>
+   <tr height="5"></tr>
+
+   <tr>
+    <td>[% 'Enter a description for this new draft.' | $T8 %]</td>
+   </tr>
+
+   <tr>
+    <td>
+    [% 'Description' | $T8 %]:
+    <input name="draft_description">
+    </td>
+   </tr>
+
+   <tr>
+    <td>
+     <input type="submit" class="submit" name="action" value="[% 'Save draft' | $T8 %]">
+    </td>
+   </tr>
+  </table>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/drafts/save_new_de.html b/templates/webpages/drafts/save_new_de.html
deleted file mode 100644 (file)
index 01c46c1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">Entwurf speichern</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>Geben Sie eine Beschreibung f&uuml;r diesen Entwurf ein.</td>
-   </tr>
-
-   <tr>
-    <td>
-    Beschreibung:
-    <input name="draft_description">
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="submit" class="submit" name="action" value="Entwurf speichern">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/drafts/save_new_en.html b/templates/webpages/drafts/save_new_en.html
deleted file mode 100644 (file)
index 51d5f38..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">Save draft</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>Enter a description for this new draft.</td>
-   </tr>
-
-   <tr>
-    <td>
-    Description:
-    <input name="draft_description">
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="submit" class="submit" name="action" value="Save draft">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/drafts/save_new_master.html b/templates/webpages/drafts/save_new_master.html
deleted file mode 100644 (file)
index 3f773a1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[% USE HTML %]<body>
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop"><translate>Save draft</translate></th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td><translate>Enter a description for this new draft.</translate></td>
-   </tr>
-
-   <tr>
-    <td>
-    <translate>Description</translate>:
-    <input name="draft_description">
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-     <input type="submit" class="submit" name="action" value="<translate>Save draft</translate>">
-    </td>
-   </tr>
-  </table>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
new file mode 100644 (file)
index 0000000..9b6d4e2
--- /dev/null
@@ -0,0 +1,95 @@
+[%- USE T8 %]
+[% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript">
+ <!--
+     function setup_controls() {
+       fokus();
+       setupDateFormat('[% myconfig_dateformat %]', '[% 'Wrong date format!' | $T8 %]');
+       setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
+     }
+   -->
+</script>
+
+<body onLoad="setup_controls();">
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" name="search" action="dn.pl">
+
+  <table>
+   <tr>
+    <th align="right">[% 'Customer' | $T8 %]</th>
+    <td colspan="3">
+     [% IF SHOW_CUSTOMER_SELECTION %]
+      <select name="customer">
+       <option></option>
+       [% FOREACH row = all_customer %]<option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>[% END %]
+      </select>
+      [% ELSE %]
+      <input name="customer" size="35">
+     [% END %]
+    </td>
+   </tr>
+
+   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
+    <tr>
+     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
+     <td colspan="3">
+      <select name="dunning_level">
+       <option></option>
+       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+   [% END %]
+
+   [% IF SHOW_DEPARTMENT_SELECTION %]
+    <tr>
+     <th align="right">[% 'Department' | $T8 %]</th>
+     <td colspan="3">
+      <select name="department">
+       <option></option>
+       [% FOREACH row = all_departments %]<option>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+   [% END %]
+
+   <tr>
+    <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
+    <td colspan="3"><input name="invnumber" size="20"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+    <td colspan="3"><input name="ordnumber" size="20"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
+    <td colspan="3"><input name="notes" size="40"></td>
+   </tr>
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Minimum Amount' | $T8 %]</th>
+    <td><input name="minamount" size="6"></td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Group Invoices' | $T8 %]</th>
+    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="nextsub" value="show_invoices">
+
+  <br>
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+
+ </form>
+
+</body>
+
+</html>
diff --git a/templates/webpages/dunning/add_de.html b/templates/webpages/dunning/add_de.html
deleted file mode 100644 (file)
index 6a1c193..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript">
- <!--
-     function setup_controls() {
-       fokus();
-       setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
-     }
-   -->
-</script>
-
-<body onLoad="setup_controls();">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="search" action="dn.pl">
-
-  <table>
-   <tr>
-    <th align="right">Kunde</th>
-    <td colspan="3">
-     [% IF SHOW_CUSTOMER_SELECTION %]
-      <select name="customer">
-       <option></option>
-       [% FOREACH row = all_customer %]<option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-      [% ELSE %]
-      <input name="customer" size="35">
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
-    <tr>
-     <th align="right">Nächste Mahnstufe</th>
-     <td colspan="3">
-      <select name="dunning_level">
-       <option></option>
-       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   [% IF SHOW_DEPARTMENT_SELECTION %]
-    <tr>
-     <th align="right">Abteilung</th>
-     <td colspan="3">
-      <select name="department">
-       <option></option>
-       [% FOREACH row = all_departments %]<option>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <th align="right" nowrap>Rechnungsnummer</th>
-    <td colspan="3"><input name="invnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Auftragsnummer</th>
-    <td colspan="3"><input name="ordnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Bemerkungen</th>
-    <td colspan="3"><input name="notes" size="40"></td>
-   </tr>
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr>
-    <th align="right" nowrap>Mindestbetrag</th>
-    <td><input name="minamount" size="6"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Rechnungen zusammenfassen</th>
-    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_invoices">
-
-  <br>
-  <input class="submit" type="submit" name="action" value="Weiter">
-
- </form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/add_en.html b/templates/webpages/dunning/add_en.html
deleted file mode 100644 (file)
index 0f1b7b1..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript">
- <!--
-     function setup_controls() {
-       fokus();
-       setupDateFormat('[% myconfig_dateformat %]', 'Wrong date format!');
-       setupPoints('[% myconfig_numberformat %]', 'wrongformat');
-     }
-   -->
-</script>
-
-<body onLoad="setup_controls();">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="search" action="dn.pl">
-
-  <table>
-   <tr>
-    <th align="right">Customer</th>
-    <td colspan="3">
-     [% IF SHOW_CUSTOMER_SELECTION %]
-      <select name="customer">
-       <option></option>
-       [% FOREACH row = all_customer %]<option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-      [% ELSE %]
-      <input name="customer" size="35">
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
-    <tr>
-     <th align="right">Next Dunning Level</th>
-     <td colspan="3">
-      <select name="dunning_level">
-       <option></option>
-       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   [% IF SHOW_DEPARTMENT_SELECTION %]
-    <tr>
-     <th align="right">Department</th>
-     <td colspan="3">
-      <select name="department">
-       <option></option>
-       [% FOREACH row = all_departments %]<option>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <th align="right" nowrap>Invoice Number</th>
-    <td colspan="3"><input name="invnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Order Number</th>
-    <td colspan="3"><input name="ordnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Notes</th>
-    <td colspan="3"><input name="notes" size="40"></td>
-   </tr>
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr>
-    <th align="right" nowrap>Minimum Amount</th>
-    <td><input name="minamount" size="6"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap>Group Invoices</th>
-    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_invoices">
-
-  <br>
-  <input class="submit" type="submit" name="action" value="Continue">
-
- </form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/add_master.html b/templates/webpages/dunning/add_master.html
deleted file mode 100644 (file)
index 3c29092..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-[% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript">
- <!--
-     function setup_controls() {
-       fokus();
-       setupDateFormat('[% myconfig_dateformat %]', '<translate>Wrong date format!</translate>');
-       setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
-     }
-   -->
-</script>
-
-<body onLoad="setup_controls();">
-
- <div class="listtop">[% title %]</div>
-
- <form method="post" name="search" action="dn.pl">
-
-  <table>
-   <tr>
-    <th align="right"><translate>Customer</translate></th>
-    <td colspan="3">
-     [% IF SHOW_CUSTOMER_SELECTION %]
-      <select name="customer">
-       <option></option>
-       [% FOREACH row = all_customer %]<option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-      [% ELSE %]
-      <input name="customer" size="35">
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
-    <tr>
-     <th align="right"><translate>Next Dunning Level</translate></th>
-     <td colspan="3">
-      <select name="dunning_level">
-       <option></option>
-       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   [% IF SHOW_DEPARTMENT_SELECTION %]
-    <tr>
-     <th align="right"><translate>Department</translate></th>
-     <td colspan="3">
-      <select name="department">
-       <option></option>
-       [% FOREACH row = all_departments %]<option>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-   [% END %]
-
-   <tr>
-    <th align="right" nowrap><translate>Invoice Number</translate></th>
-    <td colspan="3"><input name="invnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Order Number</translate></th>
-    <td colspan="3"><input name="ordnumber" size="20"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Notes</translate></th>
-    <td colspan="3"><input name="notes" size="40"></td>
-   </tr>
-
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Minimum Amount</translate></th>
-    <td><input name="minamount" size="6"></td>
-   </tr>
-
-   <tr>
-    <th align="right" nowrap><translate>Group Invoices</translate></th>
-    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_invoices">
-
-  <br>
-  <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-
- </form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/edit_config.html b/templates/webpages/dunning/edit_config.html
new file mode 100644 (file)
index 0000000..b539ad9
--- /dev/null
@@ -0,0 +1,134 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/dunning.js"></script>
+
+ <div class="listtop" width="100%">[% title %]</div>
+
+ <form method="post" action="dn.pl" name="Form">
+  <table>
+   <tr height="5"></tr>
+
+   <tr>
+    <th class="listheading">[% 'Dunning Level' | $T8 %]</th>
+    <th class="listheading">[% 'Dunning Description' | $T8 %]</th>
+    <th class="listheading">[% 'Active?' | $T8 %]</th>
+    <th class="listheading">[% 'eMail Send?' | $T8 %]</th>
+<!--     <th class="listheading">[% 'Auto Send?' | $T8 %]</th>  -->
+    <th class="listheading">[% 'Create invoice?' | $T8 %]</th>
+    <th class="listheading">[% 'Fristsetzung' | $T8 %]</th>
+    <th class="listheading">[% 'Duedate +Days' | $T8 %]</th>
+    <th class="listheading">[% 'Fee' | $T8 %]</th>
+    <th class="listheading">[% 'Interest Rate' | $T8 %]</th>
+    <th class="listheading">[% 'Template' | $T8 %]</th>
+   </tr>
+
+   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
+    <tr valign="top" class="listrow[% IF odd %]1[% SET odd = '0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
+     <td>
+      <input type="hidden" name="dunning_level_[% DUNNING_it.count %]" value="[% DUNNING_it.count %]">
+      <input type="hidden" name="id_[% DUNNING_it.count %]" value="[% HTML.escape(row.id) %]">
+      [% DUNNING_it.count %]
+     </td>
+
+     <td><input name="dunning_description_[% DUNNING_it.count %]" value="[% HTML.escape(row.dunning_description) %]"></td>
+     <td><input type="checkbox" name="active_[% DUNNING_it.count %]" value="1" [% IF row.active %]checked[% END %]></td>
+
+     <td>
+      <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
+      <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
+       [% 'L' | $T8 %]</button>
+      <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
+      <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
+      <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
+     </td>
+
+<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
+     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
+     <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
+     <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
+     <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
+     <td><input name="interest_rate_[% DUNNING_it.count %]" size="4" value="[% HTML.escape(row.interest_rate) %]">%</td>
+     <td><input name="template_[% DUNNING_it.count %]" value="[% HTML.escape(row.template) %]"></td>
+    </tr>
+    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
+   [% END %]
+
+   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
+   <tr valign="top" class="listrow[% IF odd %]1[% ELSE %]0[% END %]">
+    <td>
+     <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
+     <input type="hidden" name="id_[% rowcount %]">
+     [% rowcount %]
+    </td>
+
+    <td><input name="dunning_description_[% rowcount %]"></td>
+    <td><input type="checkbox" name="active_[% rowcount %]" value="1" checked></td>
+
+    <td>
+     <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
+     <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
+      [% 'L' | $T8 %]</button>
+     <input type="hidden" name="email_body_[% rowcount %]">
+     <input type="hidden" name="email_subject_[% rowcount %]">
+     <input type="hidden" name="email_attachment_[% rowcount %]">
+    </td>
+
+<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
+    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
+    <td><input name="payment_terms_[% rowcount %]" size="3"></td>
+    <td><input name="terms_[% rowcount %]" size="3"></td>
+    <td><input name="fee_[% rowcount %]" size="5"></td>
+    <td><input name="interest_rate_[% rowcount %]" size="4">%</td>
+    <td><input name="template_[% rowcount %]"></td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+
+  <hr size="3" noshade>
+
+  <p>[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]</p>
+
+  <table>
+   <tr>
+    <th align="right">[% 'Account for fees' | $T8 %]</th>
+    <td>
+     <select name="AR_amount_fee">
+      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+      [% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <th align="right">[% 'Account for interest' | $T8 %]</th>
+    <td>
+     <select name="AR_amount_interest">
+      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+      [% END %]
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <th align="right">[% 'Record in' | $T8 %]</th>
+    <td>
+     <select name="AR">
+      [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+      [% END %]
+     </select>
+    </td>
+   </tr>
+  </table>
+
+  <hr size="3" noshade>
+
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
+
+ </form>
+</body>
+
+</html>
diff --git a/templates/webpages/dunning/edit_config_de.html b/templates/webpages/dunning/edit_config_de.html
deleted file mode 100644 (file)
index d829d3b..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <form method="post" action="dn.pl" name="Form">
-  <table>
-   <tr height="5"></tr>
-
-   <tr>
-    <th class="listheading">Mahnlevel</th>
-    <th class="listheading">Mahnstufenbeschreibung</th>
-    <th class="listheading">Aktiviert?</th>
-    <th class="listheading">eMail-Versand?</th>
-<!--     <th class="listheading">Auto. Versand?</th>  -->
-    <th class="listheading">Rechnung erstellen?</th>
-    <th class="listheading">Fristsetzung</th>
-    <th class="listheading">Fällikeitsdatum +Tage</th>
-    <th class="listheading">Gebühr</th>
-    <th class="listheading">Zinssatz</th>
-    <th class="listheading">Druckvorlage</th>
-   </tr>
-
-   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
-    <tr valign="top" class="listrow[% IF odd %]1[% SET odd = '0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
-     <td>
-      <input type="hidden" name="dunning_level_[% DUNNING_it.count %]" value="[% DUNNING_it.count %]">
-      <input type="hidden" name="id_[% DUNNING_it.count %]" value="[% HTML.escape(row.id) %]">
-      [% DUNNING_it.count %]
-     </td>
-
-     <td><input name="dunning_description_[% DUNNING_it.count %]" value="[% HTML.escape(row.dunning_description) %]"></td>
-     <td><input type="checkbox" name="active_[% DUNNING_it.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-
-     <td>
-      <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
-      <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
-       L</button>
-      <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
-      <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
-      <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
-     </td>
-
-<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
-     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
-     <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
-     <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
-     <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
-     <td><input name="interest_rate_[% DUNNING_it.count %]" size="4" value="[% HTML.escape(row.interest_rate) %]">%</td>
-     <td><input name="template_[% DUNNING_it.count %]" value="[% HTML.escape(row.template) %]"></td>
-    </tr>
-    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
-   [% END %]
-
-   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
-   <tr valign="top" class="listrow[% IF odd %]1[% ELSE %]0[% END %]">
-    <td>
-     <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
-     <input type="hidden" name="id_[% rowcount %]">
-     [% rowcount %]
-    </td>
-
-    <td><input name="dunning_description_[% rowcount %]"></td>
-    <td><input type="checkbox" name="active_[% rowcount %]" value="1" checked></td>
-
-    <td>
-     <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
-     <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
-      L</button>
-     <input type="hidden" name="email_body_[% rowcount %]">
-     <input type="hidden" name="email_subject_[% rowcount %]">
-     <input type="hidden" name="email_attachment_[% rowcount %]">
-    </td>
-
-<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
-    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
-    <td><input name="payment_terms_[% rowcount %]" size="3"></td>
-    <td><input name="terms_[% rowcount %]" size="3"></td>
-    <td><input name="fee_[% rowcount %]" size="5"></td>
-    <td><input name="interest_rate_[% rowcount %]" size="4">%</td>
-    <td><input name="template_[% rowcount %]"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-
-  <hr size="3" noshade>
-
-  <p>Wenn das automatische Erstellen einer Rechnung &uuml;ber Mahngeb&uuml;hren und Zinsen f&uuml;r ein Mahnlevel aktiviert ist, so werden die folgenden Konten f&uuml;r die Rechnung benutzt.</p>
-
-  <table>
-   <tr>
-    <th align="right">Konto f&uuml;r Geb&uuml;hren</th>
-    <td>
-     <select name="AR_amount_fee">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right">Konto f&uuml;r Zinsen</th>
-    <td>
-     <select name="AR_amount_interest">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right">Buchen auf</th>
-    <td>
-     <select name="AR">
-      [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input class="submit" type="submit" name="action" value="Speichern">
-
- </form>
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/edit_config_en.html b/templates/webpages/dunning/edit_config_en.html
deleted file mode 100644 (file)
index 18d91ca..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <form method="post" action="dn.pl" name="Form">
-  <table>
-   <tr height="5"></tr>
-
-   <tr>
-    <th class="listheading">Dunning Level</th>
-    <th class="listheading">Dunning Description</th>
-    <th class="listheading">Active?</th>
-    <th class="listheading">eMail Send?</th>
-<!--     <th class="listheading">Auto Send?</th>  -->
-    <th class="listheading">Create invoice?</th>
-    <th class="listheading">Fristsetzung</th>
-    <th class="listheading">Duedate +Days</th>
-    <th class="listheading">Fee</th>
-    <th class="listheading">Interest Rate</th>
-    <th class="listheading">Template</th>
-   </tr>
-
-   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
-    <tr valign="top" class="listrow[% IF odd %]1[% SET odd = '0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
-     <td>
-      <input type="hidden" name="dunning_level_[% DUNNING_it.count %]" value="[% DUNNING_it.count %]">
-      <input type="hidden" name="id_[% DUNNING_it.count %]" value="[% HTML.escape(row.id) %]">
-      [% DUNNING_it.count %]
-     </td>
-
-     <td><input name="dunning_description_[% DUNNING_it.count %]" value="[% HTML.escape(row.dunning_description) %]"></td>
-     <td><input type="checkbox" name="active_[% DUNNING_it.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-
-     <td>
-      <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
-      <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
-       L</button>
-      <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
-      <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
-      <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
-     </td>
-
-<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
-     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
-     <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
-     <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
-     <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
-     <td><input name="interest_rate_[% DUNNING_it.count %]" size="4" value="[% HTML.escape(row.interest_rate) %]">%</td>
-     <td><input name="template_[% DUNNING_it.count %]" value="[% HTML.escape(row.template) %]"></td>
-    </tr>
-    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
-   [% END %]
-
-   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
-   <tr valign="top" class="listrow[% IF odd %]1[% ELSE %]0[% END %]">
-    <td>
-     <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
-     <input type="hidden" name="id_[% rowcount %]">
-     [% rowcount %]
-    </td>
-
-    <td><input name="dunning_description_[% rowcount %]"></td>
-    <td><input type="checkbox" name="active_[% rowcount %]" value="1" checked></td>
-
-    <td>
-     <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
-     <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
-      L</button>
-     <input type="hidden" name="email_body_[% rowcount %]">
-     <input type="hidden" name="email_subject_[% rowcount %]">
-     <input type="hidden" name="email_attachment_[% rowcount %]">
-    </td>
-
-<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
-    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
-    <td><input name="payment_terms_[% rowcount %]" size="3"></td>
-    <td><input name="terms_[% rowcount %]" size="3"></td>
-    <td><input name="fee_[% rowcount %]" size="5"></td>
-    <td><input name="interest_rate_[% rowcount %]" size="4">%</td>
-    <td><input name="template_[% rowcount %]"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-
-  <hr size="3" noshade>
-
-  <p>If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.</p>
-
-  <table>
-   <tr>
-    <th align="right">Account for fees</th>
-    <td>
-     <select name="AR_amount_fee">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right">Account for interest</th>
-    <td>
-     <select name="AR_amount_interest">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right">Record in</th>
-    <td>
-     <select name="AR">
-      [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input class="submit" type="submit" name="action" value="Save">
-
- </form>
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/edit_config_master.html b/templates/webpages/dunning/edit_config_master.html
deleted file mode 100644 (file)
index 3d8cb60..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <form method="post" action="dn.pl" name="Form">
-  <table>
-   <tr height="5"></tr>
-
-   <tr>
-    <th class="listheading"><translate>Dunning Level</translate></th>
-    <th class="listheading"><translate>Dunning Description</translate></th>
-    <th class="listheading"><translate>Active?</translate></th>
-    <th class="listheading"><translate>eMail Send?</translate></th>
-<!--     <th class="listheading"><translate>Auto Send?</translate></th>  -->
-    <th class="listheading"><translate>Create invoice?</translate></th>
-    <th class="listheading"><translate>Fristsetzung</translate></th>
-    <th class="listheading"><translate>Duedate +Days</translate></th>
-    <th class="listheading"><translate>Fee</translate></th>
-    <th class="listheading"><translate>Interest Rate</translate></th>
-    <th class="listheading"><translate>Template</translate></th>
-   </tr>
-
-   [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
-    <tr valign="top" class="listrow[% IF odd %]1[% SET odd = '0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
-     <td>
-      <input type="hidden" name="dunning_level_[% DUNNING_it.count %]" value="[% DUNNING_it.count %]">
-      <input type="hidden" name="id_[% DUNNING_it.count %]" value="[% HTML.escape(row.id) %]">
-      [% DUNNING_it.count %]
-     </td>
-
-     <td><input name="dunning_description_[% DUNNING_it.count %]" value="[% HTML.escape(row.dunning_description) %]"></td>
-     <td><input type="checkbox" name="active_[% DUNNING_it.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-
-     <td>
-      <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
-      <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
-       <translate>L</translate></button>
-      <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
-      <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
-      <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
-     </td>
-
-<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
-     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
-     <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
-     <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
-     <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
-     <td><input name="interest_rate_[% DUNNING_it.count %]" size="4" value="[% HTML.escape(row.interest_rate) %]">%</td>
-     <td><input name="template_[% DUNNING_it.count %]" value="[% HTML.escape(row.template) %]"></td>
-    </tr>
-    [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
-   [% END %]
-
-   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
-   <tr valign="top" class="listrow[% IF odd %]1[% ELSE %]0[% END %]">
-    <td>
-     <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
-     <input type="hidden" name="id_[% rowcount %]">
-     [% rowcount %]
-    </td>
-
-    <td><input name="dunning_description_[% rowcount %]"></td>
-    <td><input type="checkbox" name="active_[% rowcount %]" value="1" checked></td>
-
-    <td>
-     <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
-     <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
-      <translate>L</translate></button>
-     <input type="hidden" name="email_body_[% rowcount %]">
-     <input type="hidden" name="email_subject_[% rowcount %]">
-     <input type="hidden" name="email_attachment_[% rowcount %]">
-    </td>
-
-<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
-    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
-    <td><input name="payment_terms_[% rowcount %]" size="3"></td>
-    <td><input name="terms_[% rowcount %]" size="3"></td>
-    <td><input name="fee_[% rowcount %]" size="5"></td>
-    <td><input name="interest_rate_[% rowcount %]" size="4">%</td>
-    <td><input name="template_[% rowcount %]"></td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-
-  <hr size="3" noshade>
-
-  <p><translate>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.</translate></p>
-
-  <table>
-   <tr>
-    <th align="right"><translate>Account for fees</translate></th>
-    <td>
-     <select name="AR_amount_fee">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right"><translate>Account for interest</translate></th>
-    <td>
-     <select name="AR_amount_interest">
-      [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <th align="right"><translate>Record in</translate></th>
-    <td>
-     <select name="AR">
-      [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
-      [% END %]
-     </select>
-    </td>
-   </tr>
-  </table>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
-
- </form>
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
new file mode 100644 (file)
index 0000000..6611df2
--- /dev/null
@@ -0,0 +1,150 @@
+[%- USE T8 %]
+[% USE HTML %]<body onLoad="[% onload %]">
+
+ <script type="text/javascript" src="js/common.js"></script>
+
+ <form method="post" name="search" action="dn.pl">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+   <tr>
+    <td>
+     <table>
+      <tr>
+       <th align="right">[% 'Customer' | $T8 %]</th>
+       <td colspan="3">
+        [% IF SHOW_CUSTOMER_DDBOX %]
+         <select name="customer_id">
+          <option value=""></option>
+          [% FOREACH row = ALL_CUSTOMERS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %]</option>
+          [% END %]
+         </select>
+         [% ELSE %]
+         <input name="customer" size="35">
+        [% END %]
+       </td>
+      </tr>
+
+      [% IF SHOW_DUNNING_LEVELS %]
+       <tr>
+        <th align="right" nowrap>[% 'Dunning Level' | $T8 %]</th>
+        <td colspan="3">
+         <select name="dunning_level">
+          <option value=""></option>
+          [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
+          [% END %]
+         </select>
+        </td>
+       </tr>
+      [% END %]
+
+      [% IF SHOW_DEPARTMENT_DDBOX %]
+       <tr>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+        <td colspan="3">
+         <select name="department_id">
+          <option value=""></option>
+          [% FOREACH row = ALL_DEPARTMENTS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</option>
+          [% END %]
+         </select>
+        </td>
+       </tr>
+      [% END %]
+
+      <tr>
+       <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
+       <td colspan="3"><input name="invnumber" size="20"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+       <td colspan="3"><input name="ordnumber" size="20"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
+       <td colspan="3"><input name="notes" size="40"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Invdate from' | $T8 %]</th>
+       <td>
+        <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
+        <input type="button" name="transdatefrom" id="trigger1" value="?">
+       </td>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
+       <td>
+        <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
+        <input type="button" name="transdateto" id="trigger2" value="?">
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Dunning Date from' | $T8 %]</th>
+       <td>
+        <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
+        <input type="button" name="dunningfrom" id="trigger3" value="?">
+       </td>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
+       <td>
+        <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
+        <input type="button" name="dunningto" id="trigger4" value="?">
+       </td>
+      </tr>
+      <tr>
+       <th align="right">[% 'Salesman' | $T8 %]</th>
+       <td>
+        [%- 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,
+         -%]
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+
+   <tr><td><hr size="3" noshade></td></tr>
+
+   <tr>
+    <td>
+     <table>
+      <tr>
+       <th align="right" nowrap>[% 'Show old dunnings' | $T8 %]</th>
+       <td><input type="checkbox" value="1" name="showold"></td>
+       <th align="right" nowrap>[% 'Show Salesman' | $T8 %]</th>
+       <td><input type="checkbox" value="1" name="l_salesman"></td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+  </table>
+
+  <input type="hidden" name="nextsub" value="show_dunning">
+
+  <br>
+
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
+      Calendar.setup({ inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger2" });
+      Calendar.setup({ inputField : "dunningfrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger3" });
+      Calendar.setup({ inputField : "dunningto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger4" });
+    -->
+ </script>
+
+</body>
+
+</html>
diff --git a/templates/webpages/dunning/search_de.html b/templates/webpages/dunning/search_de.html
deleted file mode 100644 (file)
index d715c15..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body onLoad="[% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
-
- <form method="post" name="search" action="dn.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right">Kunde</th>
-       <td colspan="3">
-        [% IF SHOW_CUSTOMER_DDBOX %]
-         <select name="customer_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_CUSTOMERS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %]</option>
-          [% END %]
-         </select>
-         [% ELSE %]
-         <input name="customer" size="35">
-        [% END %]
-       </td>
-      </tr>
-
-      [% IF SHOW_DUNNING_LEVELS %]
-       <tr>
-        <th align="right" nowrap>Mahnlevel</th>
-        <td colspan="3">
-         <select name="dunning_level">
-          <option value=""></option>
-          [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      [% IF SHOW_DEPARTMENT_DDBOX %]
-       <tr>
-        <th align="right" nowrap>Abteilung</th>
-        <td colspan="3">
-         <select name="department_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_DEPARTMENTS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      <tr>
-       <th align="right" nowrap>Rechnungsnummer</th>
-       <td colspan="3"><input name="invnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Auftragsnummer</th>
-       <td colspan="3"><input name="ordnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Bemerkungen</th>
-       <td colspan="3"><input name="notes" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Rechnungen von</th>
-       <td>
-        <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdatefrom" id="trigger1" value="?">
-       </td>
-       <th align="right" nowrap>Bis</th>
-       <td>
-        <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdateto" id="trigger2" value="?">
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Mahnungen von</th>
-       <td>
-        <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningfrom" id="trigger3" value="?">
-       </td>
-       <th align="right" nowrap>Bis</th>
-       <td>
-        <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningto" id="trigger4" value="?">
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Verkäufer/in</th>
-       <td>
-        [%- 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,
-         -%]
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   <tr><td><hr size="3" noshade></td></tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap>Alte Mahnungen anzeigen</th>
-       <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap>Verkäufer anzeigen</th>
-       <td><input type="checkbox" value="1" name="l_salesman"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_dunning">
-
-  <br>
-
-  <input class="submit" type="submit" name="action" value="Weiter">
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-      Calendar.setup({ inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger2" });
-      Calendar.setup({ inputField : "dunningfrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger3" });
-      Calendar.setup({ inputField : "dunningto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger4" });
-    -->
- </script>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/search_en.html b/templates/webpages/dunning/search_en.html
deleted file mode 100644 (file)
index 2b3e8d8..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body onLoad="[% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
-
- <form method="post" name="search" action="dn.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right">Customer</th>
-       <td colspan="3">
-        [% IF SHOW_CUSTOMER_DDBOX %]
-         <select name="customer_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_CUSTOMERS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %]</option>
-          [% END %]
-         </select>
-         [% ELSE %]
-         <input name="customer" size="35">
-        [% END %]
-       </td>
-      </tr>
-
-      [% IF SHOW_DUNNING_LEVELS %]
-       <tr>
-        <th align="right" nowrap>Dunning Level</th>
-        <td colspan="3">
-         <select name="dunning_level">
-          <option value=""></option>
-          [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      [% IF SHOW_DEPARTMENT_DDBOX %]
-       <tr>
-        <th align="right" nowrap>Department</th>
-        <td colspan="3">
-         <select name="department_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_DEPARTMENTS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      <tr>
-       <th align="right" nowrap>Invoice Number</th>
-       <td colspan="3"><input name="invnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Order Number</th>
-       <td colspan="3"><input name="ordnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Notes</th>
-       <td colspan="3"><input name="notes" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Invdate from</th>
-       <td>
-        <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdatefrom" id="trigger1" value="?">
-       </td>
-       <th align="right" nowrap>To (time)</th>
-       <td>
-        <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdateto" id="trigger2" value="?">
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Dunning Date from</th>
-       <td>
-        <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningfrom" id="trigger3" value="?">
-       </td>
-       <th align="right" nowrap>To (time)</th>
-       <td>
-        <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningto" id="trigger4" value="?">
-       </td>
-      </tr>
-      <tr>
-       <th align="right">Salesman</th>
-       <td>
-        [%- 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,
-         -%]
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   <tr><td><hr size="3" noshade></td></tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap>Show old dunnings</th>
-       <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap>Show Salesman</th>
-       <td><input type="checkbox" value="1" name="l_salesman"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_dunning">
-
-  <br>
-
-  <input class="submit" type="submit" name="action" value="Continue">
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-      Calendar.setup({ inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger2" });
-      Calendar.setup({ inputField : "dunningfrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger3" });
-      Calendar.setup({ inputField : "dunningto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger4" });
-    -->
- </script>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/search_master.html b/templates/webpages/dunning/search_master.html
deleted file mode 100644 (file)
index c2b1b3a..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-[% USE HTML %]<body onLoad="[% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
-
- <form method="post" name="search" action="dn.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right"><translate>Customer</translate></th>
-       <td colspan="3">
-        [% IF SHOW_CUSTOMER_DDBOX %]
-         <select name="customer_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_CUSTOMERS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.name) %]</option>
-          [% END %]
-         </select>
-         [% ELSE %]
-         <input name="customer" size="35">
-        [% END %]
-       </td>
-      </tr>
-
-      [% IF SHOW_DUNNING_LEVELS %]
-       <tr>
-        <th align="right" nowrap><translate>Dunning Level</translate></th>
-        <td colspan="3">
-         <select name="dunning_level">
-          <option value=""></option>
-          [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      [% IF SHOW_DEPARTMENT_DDBOX %]
-       <tr>
-        <th align="right" nowrap><translate>Department</translate></th>
-        <td colspan="3">
-         <select name="department_id">
-          <option value=""></option>
-          [% FOREACH row = ALL_DEPARTMENTS %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</option>
-          [% END %]
-         </select>
-        </td>
-       </tr>
-      [% END %]
-
-      <tr>
-       <th align="right" nowrap><translate>Invoice Number</translate></th>
-       <td colspan="3"><input name="invnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Order Number</translate></th>
-       <td colspan="3"><input name="ordnumber" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Notes</translate></th>
-       <td colspan="3"><input name="notes" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Invdate from</translate></th>
-       <td>
-        <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdatefrom" id="trigger1" value="?">
-       </td>
-       <th align="right" nowrap><translate>To (time)</translate></th>
-       <td>
-        <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="transdateto" id="trigger2" value="?">
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Dunning Date from</translate></th>
-       <td>
-        <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningfrom" id="trigger3" value="?">
-       </td>
-       <th align="right" nowrap><translate>To (time)</translate></th>
-       <td>
-        <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
-        <input type="button" name="dunningto" id="trigger4" value="?">
-       </td>
-      </tr>
-      <tr>
-       <th align="right"><translate>Salesman</translate></th>
-       <td>
-        [%- 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,
-         -%]
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
-   <tr><td><hr size="3" noshade></td></tr>
-
-   <tr>
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap><translate>Show old dunnings</translate></th>
-       <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap><translate>Show Salesman</translate></th>
-       <td><input type="checkbox" value="1" name="l_salesman"></td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_dunning">
-
-  <br>
-
-  <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
-      Calendar.setup({ inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger2" });
-      Calendar.setup({ inputField : "dunningfrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger3" });
-      Calendar.setup({ inputField : "dunningto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger4" });
-    -->
- </script>
-
-</body>
-
-</html>
diff --git a/templates/webpages/dunning/set_email.html b/templates/webpages/dunning/set_email.html
new file mode 100644 (file)
index 0000000..1b96ed9
--- /dev/null
@@ -0,0 +1,43 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <script type="text/javascript">
+  <!--
+      function email_updated() {
+        window.opener.document.getElementsByName(document.Form.input_subject.value)[0].value = document.getElementsByName("email_subject")[0].value;
+        window.opener.document.getElementsByName(document.Form.input_body.value)[0].value = document.getElementsByName("email_body")[0].value;
+        window.opener.document.getElementsByName(document.Form.input_attachment.value)[0].value = document.getElementsByName("email_attachment")[0].value;        self.close();
+      }
+    -->
+ </script>
+
+ <form name="Form">
+
+  <input type="hidden" name="input_subject" value="[% HTML.escape(input_subject) %]">
+  <input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
+  <input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
+
+  <div class="listtop" width="100%">[% title %]</div>
+
+  <table width="100%">
+   <tr>
+    <td valign="top">[% 'Subject:' | $T8 %]</td>
+    <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
+   </tr>
+
+   <tr>
+    <td valign="top">[% 'Body:' | $T8 %]</td>
+    <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
+   </tr>
+
+   <tr>
+    <td valign="top">[% 'Attach PDF:' | $T8 %]</td>
+    <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
+   </tr>
+  </table>
+
+  <button type="button" onclick="email_updated()">[% 'Save and close' | $T8 %]</button>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/dunning/set_email_de.html b/templates/webpages/dunning/set_email_de.html
deleted file mode 100644 (file)
index af313da..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <script type="text/javascript">
-  <!--
-      function email_updated() {
-        window.opener.document.getElementsByName(document.Form.input_subject.value)[0].value = document.getElementsByName("email_subject")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_body.value)[0].value = document.getElementsByName("email_body")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_attachment.value)[0].value = document.getElementsByName("email_attachment")[0].value;        self.close();
-      }
-    -->
- </script>
-
- <form name="Form">
-
-  <input type="hidden" name="input_subject" value="[% HTML.escape(input_subject) %]">
-  <input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
-  <input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td valign="top">Betreff:</td>
-    <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
-   </tr>
-
-   <tr>
-    <td valign="top">Text:</td>
-    <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
-   </tr>
-
-   <tr>
-    <td valign="top">PDF anhängen</td>
-    <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
-   </tr>
-  </table>
-
-  <button type="button" onclick="email_updated()">Speichern und schlie&szlig;en</button>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/set_email_en.html b/templates/webpages/dunning/set_email_en.html
deleted file mode 100644 (file)
index eb16d2d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <script type="text/javascript">
-  <!--
-      function email_updated() {
-        window.opener.document.getElementsByName(document.Form.input_subject.value)[0].value = document.getElementsByName("email_subject")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_body.value)[0].value = document.getElementsByName("email_body")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_attachment.value)[0].value = document.getElementsByName("email_attachment")[0].value;        self.close();
-      }
-    -->
- </script>
-
- <form name="Form">
-
-  <input type="hidden" name="input_subject" value="[% HTML.escape(input_subject) %]">
-  <input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
-  <input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td valign="top">Subject:</td>
-    <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
-   </tr>
-
-   <tr>
-    <td valign="top">Body:</td>
-    <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
-   </tr>
-
-   <tr>
-    <td valign="top">Attach PDF:</td>
-    <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
-   </tr>
-  </table>
-
-  <button type="button" onclick="email_updated()">Save and close</button>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/set_email_master.html b/templates/webpages/dunning/set_email_master.html
deleted file mode 100644 (file)
index ef5f256..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <script type="text/javascript">
-  <!--
-      function email_updated() {
-        window.opener.document.getElementsByName(document.Form.input_subject.value)[0].value = document.getElementsByName("email_subject")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_body.value)[0].value = document.getElementsByName("email_body")[0].value;
-        window.opener.document.getElementsByName(document.Form.input_attachment.value)[0].value = document.getElementsByName("email_attachment")[0].value;        self.close();
-      }
-    -->
- </script>
-
- <form name="Form">
-
-  <input type="hidden" name="input_subject" value="[% HTML.escape(input_subject) %]">
-  <input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
-  <input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
-
-  <div class="listtop" width="100%">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td valign="top"><translate>Subject:</translate></td>
-    <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
-   </tr>
-
-   <tr>
-    <td valign="top"><translate>Body:</translate></td>
-    <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
-   </tr>
-
-   <tr>
-    <td valign="top"><translate>Attach PDF:</translate></td>
-    <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
-   </tr>
-  </table>
-
-  <button type="button" onclick="email_updated()"><translate>Save and close</translate></button>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/show_dunning_bottom.html b/templates/webpages/dunning/show_dunning_bottom.html
new file mode 100644 (file)
index 0000000..8230082
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
+
+  <p>[% PRINT_OPTIONS %]</p>
+
+  <p>
+   [% 'Dunnings' | $T8 %]<br>
+   <input type="hidden" name="print_nextsub" value="print_multiple">
+   <input type="submit" class="submit" name="action" value="[% 'Print' | $T8 %]">
+  </p>
+
+ </form>
diff --git a/templates/webpages/dunning/show_dunning_bottom_de.html b/templates/webpages/dunning/show_dunning_bottom_de.html
deleted file mode 100644 (file)
index 54f6325..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   Mahnungen<br>
-   <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="Drucken">
-  </p>
-
- </form>
diff --git a/templates/webpages/dunning/show_dunning_bottom_en.html b/templates/webpages/dunning/show_dunning_bottom_en.html
deleted file mode 100644 (file)
index 82764b5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   Dunnings<br>
-   <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="Print">
-  </p>
-
- </form>
diff --git a/templates/webpages/dunning/show_dunning_bottom_master.html b/templates/webpages/dunning/show_dunning_bottom_master.html
deleted file mode 100644 (file)
index 8a2d33b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
-
-  <p>[% PRINT_OPTIONS %]</p>
-
-  <p>
-   <translate>Dunnings</translate><br>
-   <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="<translate>Print</translate>">
-  </p>
-
- </form>
diff --git a/templates/webpages/dunning/show_dunning_top.html b/templates/webpages/dunning/show_dunning_top.html
new file mode 100644 (file)
index 0000000..f835f95
--- /dev/null
@@ -0,0 +1,5 @@
+[% USE HTML %] <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/dunning.js"></script>
+
+ <form method="post" action="dn.pl">
+
diff --git a/templates/webpages/dunning/show_dunning_top_de.html b/templates/webpages/dunning/show_dunning_top_de.html
deleted file mode 100644 (file)
index f835f95..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %] <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <form method="post" action="dn.pl">
-
diff --git a/templates/webpages/dunning/show_dunning_top_en.html b/templates/webpages/dunning/show_dunning_top_en.html
deleted file mode 100644 (file)
index f835f95..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %] <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <form method="post" action="dn.pl">
-
diff --git a/templates/webpages/dunning/show_dunning_top_master.html b/templates/webpages/dunning/show_dunning_top_master.html
deleted file mode 100644 (file)
index f835f95..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[% USE HTML %] <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <form method="post" action="dn.pl">
-
diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
new file mode 100644 (file)
index 0000000..db6b1ad
--- /dev/null
@@ -0,0 +1,90 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <script type="text/javascript" src="js/checkbox_utils.js"></script>
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/dunning.js"></script>
+
+ <div class="listtop" width="100%">[% title %]</div>
+
+ <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
+
+ <form name="Form" method="post" action="dn.pl">
+
+  <table width="100%">
+   <th class="listheading" colspan="2">[% 'Current / Next Level' | $T8 %]</th>
+
+   <th class="listheading">
+    <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
+    <label for="selectall_active">[% 'Active?' | $T8 %]</label>
+   </th>
+
+   <th class="listheading">
+    <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
+    <label for="selectall_email">[% 'eMail?' | $T8 %]</label>
+   </th>
+
+   <th class="listheading">[% 'Customername' | $T8 %]</th>
+   <th class="listheading">[% 'Invno.' | $T8 %]</th>
+   <th class="listheading">[% 'Invdate' | $T8 %]</th>
+   <th class="listheading">[% 'Inv. Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Open Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Dunning Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Total Fees' | $T8 %]</th>
+   <th class="listheading">[% 'Interest' | $T8 %]</th>
+
+   <!-- Ausgabe der einzelnen Zeilen -->
+
+   [% FOREACH row = DUNNINGS %]
+    <tr class="listrow[% loop.count % 2 %]">
+
+     <td>
+      <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
+      <input type="hidden" name="customer_id_[% loop.count %]" size="2" value="[% HTML.escape(row.customer_id) %]">
+      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %]&nbsp;[% END %]
+     </td>
+
+     <td>
+      <select name="next_dunning_config_id_[% loop.count %]">
+       [% FOREACH cfg_row = row.DUNNING_CONFIG %]<option value="[% HTML.escape(cfg_row.id) %]" [% IF cfg_row.SELECTED %]selected[% END %]>[% HTML.escape(cfg_row.dunning_description) %]</option>[% END %]
+      </select>
+     </td>
+
+     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
+     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
+     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
+     <td>
+      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
+      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+     </td>
+     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
+     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
+     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
+     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
+     <td>[% HTML.escape(row.next_duedate) %]</td>
+     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
+     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
+    </tr>
+   [% END %]
+  </table>
+
+  <hr size=3 noshade>
+
+  [% PRINT_OPTIONS %]
+
+  <br>
+
+  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
+  <input name="groupinvoices" type="hidden" value="[% HTML.escape(groupinvoices) %]">
+
+  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+  <input name="nextsub" type="hidden" value="save_dunning">
+
+  <input type="hidden" name="action" value="[% 'Continue' | $T8 %]">
+
+  <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]"
+         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='[% 'The dunning process started' | $T8 %]'; document.Form.submit()"[% END %]>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html
deleted file mode 100644 (file)
index 5dbb0d5..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/checkbox_utils.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <p>Die Spalten &quot;Zahlbar bis&quot;, &quot;Kumulierte Geb&uuml;hren&quot; und &quot;Zinsen&quot; zeigen Daten der letzten f&uuml;r diese Rechnung erzeugten Mahnung.</p>
-
- <form name="Form" method="post" action="dn.pl">
-
-  <table width="100%">
-   <th class="listheading" colspan="2">Aktuelles / Nächstes Mahnlevel</th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
-    <label for="selectall_active">Aktiviert?</label>
-   </th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
-    <label for="selectall_email">eMail?</label>
-   </th>
-
-   <th class="listheading">Kundenname</th>
-   <th class="listheading">Rg. Nr.</th>
-   <th class="listheading">Rechnungsdatum</th>
-   <th class="listheading">Rg. Fälligkeit</th>
-   <th class="listheading">Betrag</th>
-   <th class="listheading">Offener Betrag</th>
-   <th class="listheading">Zahlbar bis</th>
-   <th class="listheading">Kumulierte Gebühren</th>
-   <th class="listheading">Zinsen</th>
-
-   <!-- Ausgabe der einzelnen Zeilen -->
-
-   [% FOREACH row = DUNNINGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-
-     <td>
-      <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
-      <input type="hidden" name="customer_id_[% loop.count %]" size="2" value="[% HTML.escape(row.customer_id) %]">
-      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %]&nbsp;[% END %]
-     </td>
-
-     <td>
-      <select name="next_dunning_config_id_[% loop.count %]">
-       [% FOREACH cfg_row = row.DUNNING_CONFIG %]<option value="[% HTML.escape(cfg_row.id) %]" [% IF cfg_row.SELECTED %]selected[% END %]>[% HTML.escape(cfg_row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
-     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
-     <td>
-      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
-      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
-     </td>
-     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
-     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
-     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
-     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
-     <td>[% HTML.escape(row.next_duedate) %]</td>
-     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
-     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
-    </tr>
-   [% END %]
-  </table>
-
-  <hr size=3 noshade>
-
-  [% PRINT_OPTIONS %]
-
-  <br>
-
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="groupinvoices" type="hidden" value="[% HTML.escape(groupinvoices) %]">
-
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-  <input name="nextsub" type="hidden" value="save_dunning">
-
-  <input type="hidden" name="action" value="Weiter">
-
-  <input type="submit" name="dummy" value="Weiter"
-         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='Der Mahnprozess ist gestartet.'; document.Form.submit()"[% END %]>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/show_invoices_en.html b/templates/webpages/dunning/show_invoices_en.html
deleted file mode 100644 (file)
index be49e6b..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/checkbox_utils.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <p>The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.</p>
-
- <form name="Form" method="post" action="dn.pl">
-
-  <table width="100%">
-   <th class="listheading" colspan="2">Current / Next Level</th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
-    <label for="selectall_active">Active?</label>
-   </th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
-    <label for="selectall_email">eMail?</label>
-   </th>
-
-   <th class="listheading">Customername</th>
-   <th class="listheading">Invno.</th>
-   <th class="listheading">Invdate</th>
-   <th class="listheading">Inv. Duedate</th>
-   <th class="listheading">Amount</th>
-   <th class="listheading">Open Amount</th>
-   <th class="listheading">Dunning Duedate</th>
-   <th class="listheading">Total Fees</th>
-   <th class="listheading">Interest</th>
-
-   <!-- Ausgabe der einzelnen Zeilen -->
-
-   [% FOREACH row = DUNNINGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-
-     <td>
-      <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
-      <input type="hidden" name="customer_id_[% loop.count %]" size="2" value="[% HTML.escape(row.customer_id) %]">
-      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %]&nbsp;[% END %]
-     </td>
-
-     <td>
-      <select name="next_dunning_config_id_[% loop.count %]">
-       [% FOREACH cfg_row = row.DUNNING_CONFIG %]<option value="[% HTML.escape(cfg_row.id) %]" [% IF cfg_row.SELECTED %]selected[% END %]>[% HTML.escape(cfg_row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
-     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
-     <td>
-      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
-      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
-     </td>
-     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
-     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
-     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
-     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
-     <td>[% HTML.escape(row.next_duedate) %]</td>
-     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
-     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
-    </tr>
-   [% END %]
-  </table>
-
-  <hr size=3 noshade>
-
-  [% PRINT_OPTIONS %]
-
-  <br>
-
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="groupinvoices" type="hidden" value="[% HTML.escape(groupinvoices) %]">
-
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-  <input name="nextsub" type="hidden" value="save_dunning">
-
-  <input type="hidden" name="action" value="Continue">
-
-  <input type="submit" name="dummy" value="Continue"
-         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='The dunning process started'; document.Form.submit()"[% END %]>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
deleted file mode 100644 (file)
index cdb8c2d..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-[% USE HTML %]<body>
- <script type="text/javascript" src="js/checkbox_utils.js"></script>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
- <div class="listtop" width="100%">[% title %]</div>
-
- <p><translate>The columns &quot;Dunning Duedate&quot;, &quot;Total
-   Fees&quot; and &quot;Interest&quot; show data for the previous
-   dunning created for this invoice.</translate></p>
-
- <form name="Form" method="post" action="dn.pl">
-
-  <table width="100%">
-   <th class="listheading" colspan="2"><translate>Current / Next Level</translate></th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
-    <label for="selectall_active"><translate>Active?</translate></label>
-   </th>
-
-   <th class="listheading">
-    <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
-    <label for="selectall_email"><translate>eMail?</translate></label>
-   </th>
-
-   <th class="listheading"><translate>Customername</translate></th>
-   <th class="listheading"><translate>Invno.</translate></th>
-   <th class="listheading"><translate>Invdate</translate></th>
-   <th class="listheading"><translate>Inv. Duedate</translate></th>
-   <th class="listheading"><translate>Amount</translate></th>
-   <th class="listheading"><translate>Open Amount</translate></th>
-   <th class="listheading"><translate>Dunning Duedate</translate></th>
-   <th class="listheading"><translate>Total Fees</translate></th>
-   <th class="listheading"><translate>Interest</translate></th>
-
-   <!-- Ausgabe der einzelnen Zeilen -->
-
-   [% FOREACH row = DUNNINGS %]
-    <tr class="listrow[% loop.count % 2 %]">
-
-     <td>
-      <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
-      <input type="hidden" name="customer_id_[% loop.count %]" size="2" value="[% HTML.escape(row.customer_id) %]">
-      [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %]&nbsp;[% END %]
-     </td>
-
-     <td>
-      <select name="next_dunning_config_id_[% loop.count %]">
-       [% FOREACH cfg_row = row.DUNNING_CONFIG %]<option value="[% HTML.escape(cfg_row.id) %]" [% IF cfg_row.SELECTED %]selected[% END %]>[% HTML.escape(cfg_row.dunning_description) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
-     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
-     <td>
-      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
-      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
-     </td>
-     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
-     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
-     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
-     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
-     <td>[% HTML.escape(row.next_duedate) %]</td>
-     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
-     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
-    </tr>
-   [% END %]
-  </table>
-
-  <hr size=3 noshade>
-
-  [% PRINT_OPTIONS %]
-
-  <br>
-
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="groupinvoices" type="hidden" value="[% HTML.escape(groupinvoices) %]">
-
-  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-  <input name="nextsub" type="hidden" value="save_dunning">
-
-  <input type="hidden" name="action" value="<translate>Continue</translate>">
-
-  <input type="submit" name="dummy" value="<translate>Continue</translate>"
-         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='<translate>The dunning process started</translate>'; document.Form.submit()"[% END %]>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html
new file mode 100644 (file)
index 0000000..d32f3fc
--- /dev/null
@@ -0,0 +1,110 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="on_load();">
+
+ <script type="text/javascript">
+  <!--
+      function on_load() {
+        Calendar.setup({ inputField : "follow_up_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_trigger" });
+        document.Form.subject.focus();
+      }
+    -->
+ </script>
+
+ <form action="fu.pl" method="post" name="Form">
+
+  [%- IF SAVED_MESSAGE %]
+  <p>[% SAVED_MESSAGE %]</p>
+  [%- END %]
+
+  <div class="listtop">[% title %]</div>
+
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+  <input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
+
+  <p>
+   <table>
+    <tr>
+     <td valign="top">[% 'Follow-Up for user' | $T8 %]</td>
+     <td valign="top">
+      <select name="created_for_user">
+       [%- FOREACH row = EMPLOYEES %]
+       <option value="[% HTML.escape(row.id) %]"[% IF created_for_user == row.id %] selected[% END %]>
+        [%- IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
+       </option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td valign="right">[% 'Follow-Up Date' | $T8 %]</td>
+     <td>
+      <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
+      <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
+    </tr>
+
+    <tr>
+     <td valign="right">[% 'Subject' | $T8 %]</td>
+     <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
+    </tr>
+
+    <tr>
+     <td valign="right" align="top">[% 'Body' | $T8 %]</td>
+     <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="hidden" name="action" value="dispatcher">
+   <input type="submit" class="submit" name="action_save" value="[% 'Save' | $T8 %]">
+   [%- IF id %]
+   <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+   [%- END %]
+   [%- IF POPUP_MODE %]
+   <input type="submit" class="submit" onclick="window.close()" value="[% 'Cancel' | $T8 %]">
+   [%- END %]
+  </p>
+
+  [%- IF POPUP_MODE %]
+  [%- IF FOLLOW_UPS.size %]
+  <hr height="3" noshade>
+
+  <div class="listtop">[% 'Existing pending follow-ups for this item' | $T8 %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+     <th class="listheading">[% 'Subject' | $T8 %]</th>
+     <th class="listheading">[% 'Created by' | $T8 %]</th>
+     <th class="listheading">[% 'Follow-up for' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH row = FOLLOW_UPS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
+     <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
+     <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
+     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
+    </tr>
+    [%- END %]
+   </table>
+  </p>
+  [%- END %]
+  [%- END %]
+
+  [%- FOREACH row = LINKS %]
+  <input type="hidden" name="trans_id_[% loop.count %]"   value="[% HTML.escape(row.trans_id) %]">
+  <input type="hidden" name="trans_type_[% loop.count %]" value="[% HTML.escape(row.trans_type) %]">
+  <input type="hidden" name="trans_info_[% loop.count %]" value="[% HTML.escape(row.trans_info) %]">
+  [%- END %]
+
+  <input type="hidden" name="trans_rowcount" value="[% LINKS.size %]">
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/fu/add_edit_de.html b/templates/webpages/fu/add_edit_de.html
deleted file mode 100644 (file)
index 0cc71db..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <form action="fu.pl" method="post" name="Form">
-
-  [%- IF SAVED_MESSAGE %]
-  <p>[% SAVED_MESSAGE %]</p>
-  [%- END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
-
-  <p>
-   <table>
-    <tr>
-     <td valign="top">Wiedervorlage f&uuml;r Benutzer</td>
-     <td valign="top">
-      <select name="created_for_user">
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]"[% IF created_for_user == row.id %] selected[% END %]>
-        [%- IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td valign="right">Wiedervorlagedatum</td>
-     <td>
-      <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
-      <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
-    </tr>
-
-    <tr>
-     <td valign="right">Betreff</td>
-     <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
-    </tr>
-
-    <tr>
-     <td valign="right" align="top">Text</td>
-     <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_save" value="Speichern">
-   [%- IF id %]
-   <input type="submit" class="submit" name="action_finish" value="Abschlie&szlig;en">
-   <input type="submit" class="submit" name="action_delete" value="Löschen">
-   [%- END %]
-   [%- IF POPUP_MODE %]
-   <input type="submit" class="submit" onclick="window.close()" value="Abbrechen">
-   [%- END %]
-  </p>
-
-  [%- IF POPUP_MODE %]
-  [%- IF FOLLOW_UPS.size %]
-  <hr height="3" noshade>
-
-  <div class="listtop">Noch nicht erledigte Wiedervorlagen f&uuml;r dieses Dokument</div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Wiedervorlagedatum</th>
-     <th class="listheading">Betreff</th>
-     <th class="listheading">Erstellt von</th>
-     <th class="listheading">Wiedervorlage für</th>
-    </tr>
-
-    [%- FOREACH row = FOLLOW_UPS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
-     <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
-     <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
-     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-  [%- END %]
-  [%- END %]
-
-  [%- FOREACH row = LINKS %]
-  <input type="hidden" name="trans_id_[% loop.count %]"   value="[% HTML.escape(row.trans_id) %]">
-  <input type="hidden" name="trans_type_[% loop.count %]" value="[% HTML.escape(row.trans_type) %]">
-  <input type="hidden" name="trans_info_[% loop.count %]" value="[% HTML.escape(row.trans_info) %]">
-  [%- END %]
-
-  <input type="hidden" name="trans_rowcount" value="[% LINKS.size %]">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/fu/add_edit_en.html b/templates/webpages/fu/add_edit_en.html
deleted file mode 100644 (file)
index edfcc28..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <form action="fu.pl" method="post" name="Form">
-
-  [%- IF SAVED_MESSAGE %]
-  <p>[% SAVED_MESSAGE %]</p>
-  [%- END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
-
-  <p>
-   <table>
-    <tr>
-     <td valign="top">Follow-Up for user</td>
-     <td valign="top">
-      <select name="created_for_user">
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]"[% IF created_for_user == row.id %] selected[% END %]>
-        [%- IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td valign="right">Follow-Up Date</td>
-     <td>
-      <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
-      <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
-    </tr>
-
-    <tr>
-     <td valign="right">Subject</td>
-     <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
-    </tr>
-
-    <tr>
-     <td valign="right" align="top">Body</td>
-     <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_save" value="Save">
-   [%- IF id %]
-   <input type="submit" class="submit" name="action_finish" value="Finish">
-   <input type="submit" class="submit" name="action_delete" value="Delete">
-   [%- END %]
-   [%- IF POPUP_MODE %]
-   <input type="submit" class="submit" onclick="window.close()" value="Cancel">
-   [%- END %]
-  </p>
-
-  [%- IF POPUP_MODE %]
-  [%- IF FOLLOW_UPS.size %]
-  <hr height="3" noshade>
-
-  <div class="listtop">Existing pending follow-ups for this item</div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Follow-Up Date</th>
-     <th class="listheading">Subject</th>
-     <th class="listheading">Created by</th>
-     <th class="listheading">Follow-up for</th>
-    </tr>
-
-    [%- FOREACH row = FOLLOW_UPS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
-     <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
-     <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
-     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-  [%- END %]
-  [%- END %]
-
-  [%- FOREACH row = LINKS %]
-  <input type="hidden" name="trans_id_[% loop.count %]"   value="[% HTML.escape(row.trans_id) %]">
-  <input type="hidden" name="trans_type_[% loop.count %]" value="[% HTML.escape(row.trans_type) %]">
-  <input type="hidden" name="trans_info_[% loop.count %]" value="[% HTML.escape(row.trans_info) %]">
-  [%- END %]
-
-  <input type="hidden" name="trans_rowcount" value="[% LINKS.size %]">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/fu/add_edit_master.html b/templates/webpages/fu/add_edit_master.html
deleted file mode 100644 (file)
index bcacbf2..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-[% USE HTML %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <form action="fu.pl" method="post" name="Form">
-
-  [%- IF SAVED_MESSAGE %]
-  <p>[% SAVED_MESSAGE %]</p>
-  [%- END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
-
-  <p>
-   <table>
-    <tr>
-     <td valign="top"><translate>Follow-Up for user</translate></td>
-     <td valign="top">
-      <select name="created_for_user">
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]"[% IF created_for_user == row.id %] selected[% END %]>
-        [%- IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td valign="right"><translate>Follow-Up Date</translate></td>
-     <td>
-      <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
-      <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
-    </tr>
-
-    <tr>
-     <td valign="right"><translate>Subject</translate></td>
-     <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
-    </tr>
-
-    <tr>
-     <td valign="right" align="top"><translate>Body</translate></td>
-     <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_save" value="<translate>Save</translate>">
-   [%- IF id %]
-   <input type="submit" class="submit" name="action_finish" value="<translate>Finish</translate>">
-   <input type="submit" class="submit" name="action_delete" value="<translate>Delete</translate>">
-   [%- END %]
-   [%- IF POPUP_MODE %]
-   <input type="submit" class="submit" onclick="window.close()" value="<translate>Cancel</translate>">
-   [%- END %]
-  </p>
-
-  [%- IF POPUP_MODE %]
-  [%- IF FOLLOW_UPS.size %]
-  <hr height="3" noshade>
-
-  <div class="listtop"><translate>Existing pending follow-ups for this item</translate></div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Follow-Up Date</translate></th>
-     <th class="listheading"><translate>Subject</translate></th>
-     <th class="listheading"><translate>Created by</translate></th>
-     <th class="listheading"><translate>Follow-up for</translate></th>
-    </tr>
-
-    [%- FOREACH row = FOLLOW_UPS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
-     <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
-     <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
-     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-  [%- END %]
-  [%- END %]
-
-  [%- FOREACH row = LINKS %]
-  <input type="hidden" name="trans_id_[% loop.count %]"   value="[% HTML.escape(row.trans_id) %]">
-  <input type="hidden" name="trans_type_[% loop.count %]" value="[% HTML.escape(row.trans_type) %]">
-  <input type="hidden" name="trans_info_[% loop.count %]" value="[% HTML.escape(row.trans_info) %]">
-  [%- END %]
-
-  <input type="hidden" name="trans_rowcount" value="[% LINKS.size %]">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/fu/close_window.html b/templates/webpages/fu/close_window.html
new file mode 100644 (file)
index 0000000..d166865
--- /dev/null
@@ -0,0 +1 @@
+<body onload="window.close()"></body></html>
diff --git a/templates/webpages/fu/close_window_de.html b/templates/webpages/fu/close_window_de.html
deleted file mode 100644 (file)
index d166865..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<body onload="window.close()"></body></html>
diff --git a/templates/webpages/fu/close_window_en.html b/templates/webpages/fu/close_window_en.html
deleted file mode 100644 (file)
index d166865..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<body onload="window.close()"></body></html>
diff --git a/templates/webpages/fu/close_window_master.html b/templates/webpages/fu/close_window_master.html
deleted file mode 100644 (file)
index d166865..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<body onload="window.close()"></body></html>
diff --git a/templates/webpages/fu/edit_access_rights.html b/templates/webpages/fu/edit_access_rights.html
new file mode 100644 (file)
index 0000000..2c80715
--- /dev/null
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ [%- IF SAVED_MESSAGE %]
+ <p>[% SAVED_MESSAGE %]</p>
+ [%- END %]
+
+ <div class="listtop">[% title %]</div>
+
+ <p>[% 'Allow the following users access to my follow-ups:' | $T8 %]</p>
+
+ <form action="fu.pl" method="post" name="Form">
+  <p>
+   <table>
+    <tr>
+     <td class="listheading">[% 'User' | $T8 %]</td>
+     <td class="listheading">[% 'Allow access' | $T8 %]</td>
+    </tr>
+
+    [%- FOREACH row = EMPLOYEES %]
+    [%- UNLESS row.login == login %]
+    <input type="hidden" name="employee_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+
+    <tr class="listrow[% loop.count % 2 %]">
+     <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
+     <td>
+      <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
+      <label for="access_[% HTML.escape(row.id) %]_yes">[% 'Yes' | $T8 %]</label>
+      <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
+      <label for="access_[% HTML.escape(row.id) %]_no">[% 'No' | $T8 %]</label>
+     </td>
+    </tr>
+    [%- END %]
+    [%- END %]
+   </table>
+  </p>
+
+  <input type="hidden" name="rowcount" value="[% EMPLOYEES.size %]">
+  <input type="hidden" name="save_nextsub" value="save_access_rights">
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+  </p>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/fu/edit_access_rights_de.html b/templates/webpages/fu/edit_access_rights_de.html
deleted file mode 100644 (file)
index 3f1c28e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]
-<body>
-
- [%- IF SAVED_MESSAGE %]
- <p>[% SAVED_MESSAGE %]</p>
- [%- END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>Erlaube den folgenden Benutzern Zugriff auf meine Wiedervorlagen:</p>
-
- <form action="fu.pl" method="post" name="Form">
-  <p>
-   <table>
-    <tr>
-     <td class="listheading">Benutzer</td>
-     <td class="listheading">Zugriff erlauben</td>
-    </tr>
-
-    [%- FOREACH row = EMPLOYEES %]
-    [%- UNLESS row.login == login %]
-    <input type="hidden" name="employee_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
-     <td>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_yes">Ja</label>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_no">Nein</label>
-     </td>
-    </tr>
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="rowcount" value="[% EMPLOYEES.size %]">
-  <input type="hidden" name="save_nextsub" value="save_access_rights">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/fu/edit_access_rights_en.html b/templates/webpages/fu/edit_access_rights_en.html
deleted file mode 100644 (file)
index 34b03af..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]
-<body>
-
- [%- IF SAVED_MESSAGE %]
- <p>[% SAVED_MESSAGE %]</p>
- [%- END %]
-
- <div class="listtop">[% title %]</div>
-
- <p>Allow the following users access to my follow-ups:</p>
-
- <form action="fu.pl" method="post" name="Form">
-  <p>
-   <table>
-    <tr>
-     <td class="listheading">User</td>
-     <td class="listheading">Allow access</td>
-    </tr>
-
-    [%- FOREACH row = EMPLOYEES %]
-    [%- UNLESS row.login == login %]
-    <input type="hidden" name="employee_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
-     <td>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_yes">Yes</label>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_no">No</label>
-     </td>
-    </tr>
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="rowcount" value="[% EMPLOYEES.size %]">
-  <input type="hidden" name="save_nextsub" value="save_access_rights">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Save">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/fu/edit_access_rights_master.html b/templates/webpages/fu/edit_access_rights_master.html
deleted file mode 100644 (file)
index 4f11a17..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]
-<body>
-
- [%- IF SAVED_MESSAGE %]
- <p>[% SAVED_MESSAGE %]</p>
- [%- END %]
-
- <div class="listtop">[% title %]</div>
-
- <p><translate>Allow the following users access to my follow-ups:</translate></p>
-
- <form action="fu.pl" method="post" name="Form">
-  <p>
-   <table>
-    <tr>
-     <td class="listheading"><translate>User</translate></td>
-     <td class="listheading"><translate>Allow access</translate></td>
-    </tr>
-
-    [%- FOREACH row = EMPLOYEES %]
-    [%- UNLESS row.login == login %]
-    <input type="hidden" name="employee_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
-     <td>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_yes"><translate>Yes</translate></label>
-      <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_no"><translate>No</translate></label>
-     </td>
-    </tr>
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <input type="hidden" name="rowcount" value="[% EMPLOYEES.size %]">
-  <input type="hidden" name="save_nextsub" value="save_access_rights">
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/fu/report_bottom.html b/templates/webpages/fu/report_bottom.html
new file mode 100644 (file)
index 0000000..54927a7
--- /dev/null
@@ -0,0 +1,14 @@
+[%- USE T8 %]
+[% USE HTML%]
+ <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+ [%- FOREACH item = HIDDEN %]
+ <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
+ [%- END %]
+
+ <p>
+  [% 'Follow-Ups' | $T8 %]<br>
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+ </p>
+</form>
diff --git a/templates/webpages/fu/report_bottom_de.html b/templates/webpages/fu/report_bottom_de.html
deleted file mode 100644 (file)
index 3cae2a8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML%]
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
- [%- FOREACH item = HIDDEN %]
- <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
- [%- END %]
-
- <p>
-  Wiedervorlagen<br>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" name="action_finish" value="Abschlie&szlig;en">
-  <input type="submit" name="action_delete" value="Löschen">
- </p>
-</form>
diff --git a/templates/webpages/fu/report_bottom_en.html b/templates/webpages/fu/report_bottom_en.html
deleted file mode 100644 (file)
index 085e6fa..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML%]
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
- [%- FOREACH item = HIDDEN %]
- <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
- [%- END %]
-
- <p>
-  Follow-Ups<br>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" name="action_finish" value="Finish">
-  <input type="submit" name="action_delete" value="Delete">
- </p>
-</form>
diff --git a/templates/webpages/fu/report_bottom_master.html b/templates/webpages/fu/report_bottom_master.html
deleted file mode 100644 (file)
index 5f2b844..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[% USE HTML%]
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
- [%- FOREACH item = HIDDEN %]
- <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
- [%- END %]
-
- <p>
-  <translate>Follow-Ups</translate><br>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" name="action_finish" value="<translate>Finish</translate>">
-  <input type="submit" name="action_delete" value="<translate>Delete</translate>">
- </p>
-</form>
diff --git a/templates/webpages/fu/report_for_todo_list.html b/templates/webpages/fu/report_for_todo_list.html
new file mode 100644 (file)
index 0000000..e818633
--- /dev/null
@@ -0,0 +1,42 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+<div class="listtop">[% 'Unfinished follow-ups' | $T8 %]</div>
+
+<form action="fu.pl" method="post" name="TODOFollowUpsForm">
+ <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+ <input type="hidden" name="rowcount" value="[% FOLLOW_UPS.size %]">
+
+ <p>
+  <table width="100%">
+   <tr>
+    <td class="listheading">&nbsp;</td>
+    <td class="listheading">[% 'Follow-Up Date' | $T8 %]</td>
+    <td class="listheading">[% 'Created on' | $T8 %]</td>
+    <td class="listheading">[% 'Subject' | $T8 %]</td>
+    <td class="listheading">[% 'Reference' | $T8 %]</td>
+    <td class="listheading">[% 'Created by' | $T8 %]</td>
+   </tr>
+
+   [%- FOREACH row = FOLLOW_UPS %]
+   <tr class="listrow[% loop.count % 2 %]">
+    <td>
+     <input type="hidden" name="follow_up_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+     <input type="checkbox" name="selected_[% loop.count %]" value="1">
+    </td>
+    <td>[% HTML.escape(row.follow_up_date) %]</td>
+    <td>[% HTML.escape(row.created_on) %]</td>
+    <td><a href="[% edit_url %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
+    <td>[% IF row.reference_link %]<a href="[% row.reference_link %]">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
+    <td>[% HTML.escape(row.created_by_name) %]</td>
+   </tr>
+   [%- END %]
+  </table>
+ </p>
+
+ <p>
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+ </p>
+</form>
diff --git a/templates/webpages/fu/report_for_todo_list_de.html b/templates/webpages/fu/report_for_todo_list_de.html
deleted file mode 100644 (file)
index 1fe6531..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[% USE HTML %]
-
-<div class="listtop">Nicht erledigte Wiedervorlagen</div>
-
-<form action="fu.pl" method="post" name="TODOFollowUpsForm">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% FOLLOW_UPS.size %]">
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading">&nbsp;</td>
-    <td class="listheading">Wiedervorlagedatum</td>
-    <td class="listheading">Erstellt am</td>
-    <td class="listheading">Betreff</td>
-    <td class="listheading">Referenz</td>
-    <td class="listheading">Erstellt von</td>
-   </tr>
-
-   [%- FOREACH row = FOLLOW_UPS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     <input type="hidden" name="follow_up_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-     <input type="checkbox" name="selected_[% loop.count %]" value="1">
-    </td>
-    <td>[% HTML.escape(row.follow_up_date) %]</td>
-    <td>[% HTML.escape(row.created_on) %]</td>
-    <td><a href="[% edit_url %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-    <td>[% IF row.reference_link %]<a href="[% row.reference_link %]">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
-    <td>[% HTML.escape(row.created_by_name) %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <p>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_finish" value="Abschlie&szlig;en">
-  <input type="submit" class="submit" name="action_delete" value="Löschen">
- </p>
-</form>
diff --git a/templates/webpages/fu/report_for_todo_list_en.html b/templates/webpages/fu/report_for_todo_list_en.html
deleted file mode 100644 (file)
index e59118a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[% USE HTML %]
-
-<div class="listtop">Unfinished follow-ups</div>
-
-<form action="fu.pl" method="post" name="TODOFollowUpsForm">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% FOLLOW_UPS.size %]">
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading">&nbsp;</td>
-    <td class="listheading">Follow-Up Date</td>
-    <td class="listheading">Created on</td>
-    <td class="listheading">Subject</td>
-    <td class="listheading">Reference</td>
-    <td class="listheading">Created by</td>
-   </tr>
-
-   [%- FOREACH row = FOLLOW_UPS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     <input type="hidden" name="follow_up_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-     <input type="checkbox" name="selected_[% loop.count %]" value="1">
-    </td>
-    <td>[% HTML.escape(row.follow_up_date) %]</td>
-    <td>[% HTML.escape(row.created_on) %]</td>
-    <td><a href="[% edit_url %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-    <td>[% IF row.reference_link %]<a href="[% row.reference_link %]">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
-    <td>[% HTML.escape(row.created_by_name) %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <p>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_finish" value="Finish">
-  <input type="submit" class="submit" name="action_delete" value="Delete">
- </p>
-</form>
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 (file)
index 585556b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[% USE HTML %]
-
-<div class="listtop"><translate>Unfinished follow-ups</translate></div>
-
-<form action="fu.pl" method="post" name="TODOFollowUpsForm">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% FOLLOW_UPS.size %]">
-
- <p>
-  <table width="100%">
-   <tr>
-    <td class="listheading">&nbsp;</td>
-    <td class="listheading"><translate>Follow-Up Date</translate></td>
-    <td class="listheading"><translate>Created on</translate></td>
-    <td class="listheading"><translate>Subject</translate></td>
-    <td class="listheading"><translate>Reference</translate></td>
-    <td class="listheading"><translate>Created by</translate></td>
-   </tr>
-
-   [%- FOREACH row = FOLLOW_UPS %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <td>
-     <input type="hidden" name="follow_up_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-     <input type="checkbox" name="selected_[% loop.count %]" value="1">
-    </td>
-    <td>[% HTML.escape(row.follow_up_date) %]</td>
-    <td>[% HTML.escape(row.created_on) %]</td>
-    <td><a href="[% edit_url %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-    <td>[% IF row.reference_link %]<a href="[% row.reference_link %]">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
-    <td>[% HTML.escape(row.created_by_name) %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <p>
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_finish" value="<translate>Finish</translate>">
-  <input type="submit" class="submit" name="action_delete" value="<translate>Delete</translate>">
- </p>
-</form>
diff --git a/templates/webpages/fu/report_top.html b/templates/webpages/fu/report_top.html
new file mode 100644 (file)
index 0000000..f6847d9
--- /dev/null
@@ -0,0 +1,10 @@
+[%- IF OPTIONS.size %]
+<p>
+ [%- FOREACH option = OPTIONS %]
+ [%- option %][% UNLESS loop.last %]<br>[% END %]
+ [%- END %]
+</p>
+[%- END %]
+
+<form action="fu.pl" method="post" name="Form">
+
diff --git a/templates/webpages/fu/report_top_de.html b/templates/webpages/fu/report_top_de.html
deleted file mode 100644 (file)
index f6847d9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- IF OPTIONS.size %]
-<p>
- [%- FOREACH option = OPTIONS %]
- [%- option %][% UNLESS loop.last %]<br>[% END %]
- [%- END %]
-</p>
-[%- END %]
-
-<form action="fu.pl" method="post" name="Form">
-
diff --git a/templates/webpages/fu/report_top_en.html b/templates/webpages/fu/report_top_en.html
deleted file mode 100644 (file)
index f6847d9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- IF OPTIONS.size %]
-<p>
- [%- FOREACH option = OPTIONS %]
- [%- option %][% UNLESS loop.last %]<br>[% END %]
- [%- END %]
-</p>
-[%- END %]
-
-<form action="fu.pl" method="post" name="Form">
-
diff --git a/templates/webpages/fu/report_top_master.html b/templates/webpages/fu/report_top_master.html
deleted file mode 100644 (file)
index f6847d9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- IF OPTIONS.size %]
-<p>
- [%- FOREACH option = OPTIONS %]
- [%- option %][% UNLESS loop.last %]<br>[% END %]
- [%- END %]
-</p>
-[%- END %]
-
-<form action="fu.pl" method="post" name="Form">
-
diff --git a/templates/webpages/fu/search.html b/templates/webpages/fu/search.html
new file mode 100644 (file)
index 0000000..63d8c0a
--- /dev/null
@@ -0,0 +1,123 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body onload="on_load()">
+
+ <script type="text/javascript">
+  <!--
+      function on_load() {
+        Calendar.setup({ inputField : "follow_up_date_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_from_trigger" });
+        Calendar.setup({ inputField : "follow_up_date_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_to_trigger" });
+        Calendar.setup({ inputField : "itime_from",          ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_from_trigger" });
+        Calendar.setup({ inputField : "itime_to",            ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_to_trigger" });
+        document.Form.subject.focus();
+      }
+    -->
+ </script>
+
+ <div class="listtop">[% title %]</div>
+
+ <form action="fu.pl" method="post" name="Form">
+  <input type="hidden" name="nextsub" value="report">
+
+  <p>
+   <table>
+    <tr>
+     <td align="right">[% 'Created for' | $T8 %]</td>
+     <td>
+      <select name="created_for">
+       <option></option>
+       [%- FOREACH row = EMPLOYEES %]
+       <option value="[% HTML.escape(row.id) %]">
+        [%- IF row.name %]
+        [%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
+        [%- ELSE %]
+        [%- HTML.escape(row.login) %]
+        [%- END %]
+       </option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Subject' | $T8 %]</td>
+     <td><input name="subject" size="20"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Body' | $T8 %]</td>
+     <td><input name="body" size="20"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Reference' | $T8 %]</td>
+     <td><input name="reference" size="20"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Follow-Up Date' | $T8 %]</td>
+     <td>
+      [% 'From' | $T8 %]
+      <input name="follow_up_date_from" id="follow_up_date_from" size="12">
+      <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
+      [% 'To (time)' | $T8 %]
+      <input name="follow_up_date_to" id="follow_up_date_to" size="12">
+      <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Created on' | $T8 %]</td>
+     <td>
+      [% 'From' | $T8 %]
+      <input name="itime_from" id="itime_from" size="12">
+      <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
+      [% 'To (time)' | $T8 %]
+      <input name="itime_to" id="itime_to" size="12">
+      <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Include in Report' | $T8 %]</td>
+     <td>
+
+      <table>
+       <tr>
+        <td>
+         <input type="checkbox" name="due_only" id="due_only" value="1" checked>
+         <label for="due_only">[% 'Only due follow-ups' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input type="checkbox" name="all_users" id="all_users" value="1" checked>
+         <label for="all_users">[% 'Other users\' follow-ups' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input type="checkbox" name="not_done" id="not_done" value="1" checked>
+         <label for="not_done">[% 'Not done yet' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input type="checkbox" name="done" id="done" value="1">
+         <label for="done">[% 'Done' | $T8 %]</label>
+        </td>
+       </tr>
+      </table>
+
+     </td>
+    </tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/fu/search_de.html b/templates/webpages/fu/search_de.html
deleted file mode 100644 (file)
index cff47ab..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-<body onload="on_load()">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_from_trigger" });
-        Calendar.setup({ inputField : "follow_up_date_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_to_trigger" });
-        Calendar.setup({ inputField : "itime_from",          ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_from_trigger" });
-        Calendar.setup({ inputField : "itime_to",            ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_to_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <div class="listtop">[% title %]</div>
-
- <form action="fu.pl" method="post" name="Form">
-  <input type="hidden" name="nextsub" value="report">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Erstellt f&uuml;r</td>
-     <td>
-      <select name="created_for">
-       <option></option>
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">
-        [%- IF row.name %]
-        [%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
-        [%- ELSE %]
-        [%- HTML.escape(row.login) %]
-        [%- END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Betreff</td>
-     <td><input name="subject" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Text</td>
-     <td><input name="body" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Referenz</td>
-     <td><input name="reference" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Wiedervorlagedatum</td>
-     <td>
-      Von
-      <input name="follow_up_date_from" id="follow_up_date_from" size="12">
-      <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
-      Bis
-      <input name="follow_up_date_to" id="follow_up_date_to" size="12">
-      <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Erstellt am</td>
-     <td>
-      Von
-      <input name="itime_from" id="itime_from" size="12">
-      <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
-      Bis
-      <input name="itime_to" id="itime_to" size="12">
-      <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">In Bericht aufnehmen</td>
-     <td>
-
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="due_only" id="due_only" value="1" checked>
-         <label for="due_only">Nur f&auml;llige Wiedervorlagen</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="all_users" id="all_users" value="1" checked>
-         <label for="all_users">Wiedervorlagen anderer Benutzer</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="not_done" id="not_done" value="1" checked>
-         <label for="not_done">Noch nicht fertig</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="done" id="done" value="1">
-         <label for="done">Fertig</label>
-        </td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/fu/search_en.html b/templates/webpages/fu/search_en.html
deleted file mode 100644 (file)
index ed9f22d..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-<body onload="on_load()">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_from_trigger" });
-        Calendar.setup({ inputField : "follow_up_date_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_to_trigger" });
-        Calendar.setup({ inputField : "itime_from",          ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_from_trigger" });
-        Calendar.setup({ inputField : "itime_to",            ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_to_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <div class="listtop">[% title %]</div>
-
- <form action="fu.pl" method="post" name="Form">
-  <input type="hidden" name="nextsub" value="report">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right">Created for</td>
-     <td>
-      <select name="created_for">
-       <option></option>
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">
-        [%- IF row.name %]
-        [%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
-        [%- ELSE %]
-        [%- HTML.escape(row.login) %]
-        [%- END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Subject</td>
-     <td><input name="subject" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Body</td>
-     <td><input name="body" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Reference</td>
-     <td><input name="reference" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Follow-Up Date</td>
-     <td>
-      From
-      <input name="follow_up_date_from" id="follow_up_date_from" size="12">
-      <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
-      To (time)
-      <input name="follow_up_date_to" id="follow_up_date_to" size="12">
-      <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Created on</td>
-     <td>
-      From
-      <input name="itime_from" id="itime_from" size="12">
-      <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
-      To (time)
-      <input name="itime_to" id="itime_to" size="12">
-      <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Include in Report</td>
-     <td>
-
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="due_only" id="due_only" value="1" checked>
-         <label for="due_only">Only due follow-ups</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="all_users" id="all_users" value="1" checked>
-         <label for="all_users">Other users' follow-ups</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="not_done" id="not_done" value="1" checked>
-         <label for="not_done">Not done yet</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="done" id="done" value="1">
-         <label for="done">Done</label>
-        </td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/fu/search_master.html b/templates/webpages/fu/search_master.html
deleted file mode 100644 (file)
index 94309f1..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[% USE HTML %]
-<body onload="on_load()">
-
- <script type="text/javascript">
-  <!--
-      function on_load() {
-        Calendar.setup({ inputField : "follow_up_date_from", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_from_trigger" });
-        Calendar.setup({ inputField : "follow_up_date_to",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "follow_up_date_to_trigger" });
-        Calendar.setup({ inputField : "itime_from",          ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_from_trigger" });
-        Calendar.setup({ inputField : "itime_to",            ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "itime_to_trigger" });
-        document.Form.subject.focus();
-      }
-    -->
- </script>
-
- <div class="listtop">[% title %]</div>
-
- <form action="fu.pl" method="post" name="Form">
-  <input type="hidden" name="nextsub" value="report">
-
-  <p>
-   <table>
-    <tr>
-     <td align="right"><translate>Created for</translate></td>
-     <td>
-      <select name="created_for">
-       <option></option>
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">
-        [%- IF row.name %]
-        [%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
-        [%- ELSE %]
-        [%- HTML.escape(row.login) %]
-        [%- END %]
-       </option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Subject</translate></td>
-     <td><input name="subject" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Body</translate></td>
-     <td><input name="body" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Reference</translate></td>
-     <td><input name="reference" size="20"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Follow-Up Date</translate></td>
-     <td>
-      <translate>From</translate>
-      <input name="follow_up_date_from" id="follow_up_date_from" size="12">
-      <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
-      <translate>To (time)</translate>
-      <input name="follow_up_date_to" id="follow_up_date_to" size="12">
-      <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Created on</translate></td>
-     <td>
-      <translate>From</translate>
-      <input name="itime_from" id="itime_from" size="12">
-      <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
-      <translate>To (time)</translate>
-      <input name="itime_to" id="itime_to" size="12">
-      <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Include in Report</translate></td>
-     <td>
-
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="due_only" id="due_only" value="1" checked>
-         <label for="due_only"><translate>Only due follow-ups</translate></label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="all_users" id="all_users" value="1" checked>
-         <label for="all_users"><translate>Other users' follow-ups</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="not_done" id="not_done" value="1" checked>
-         <label for="not_done"><translate>Not done yet</translate></label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="done" id="done" value="1">
-         <label for="done"><translate>Done</translate></label>
-        </td>
-       </tr>
-      </table>
-
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/calculate_qty.html b/templates/webpages/generic/calculate_qty.html
new file mode 100644 (file)
index 0000000..974c78c
--- /dev/null
@@ -0,0 +1,84 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <form name="Form">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <table width="100%">
+   <tr>
+    <th class="listtop">[% title %]</th>
+   </tr>
+   <tr height="5"></tr>
+
+   <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>
+
+   <tr>
+    <td>
+
+     <table>
+      <tr class="listheading">
+       [% FOREACH col = HEADER %]
+        <th nowrap class="listheading">[% col.column_title %]</a></th>
+       [% END %]
+      </tr>
+
+      [% FOREACH row = VARIABLES %]
+       <tr class="listrow[% loop.count % 2 %]">
+        <td>[% HTML.escape(row.description) %]:</td><td><input id="[% row.name %]" name="[% row.name %]" value=""></td>
+        <td>[% HTML.escape(row.unit) %]</td>
+       </tr>
+      [% END %]
+     </table>
+
+    </td>
+   </tr>
+  </table>
+ <button type="button" onclick="calculate_qty()">[% 'Calculate' | $T8 %]</button>
+ </form>
+
+ <script type="text/javascript">
+  <!--//
+      function calculate_qty() {
+        [% FOREACH row = VARIABLES %]
+        var [% row.name %] = document.getElementsByName("[% row.name %]")[0].value.replace(/,/g, ".");
+       [% END %]
+        var result = [% formel %];
+        result = number_format(result, 2, ",", ".");
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = result;
+        self.close();
+      }
+      //-->
+
+function /*out: String*/ number_format( /* in: float   */ number, 
+                                        /* in: integer */ laenge, 
+                                        /* in: String  */ sep, 
+                                        /* in: String  */ th_sep ) {
+
+  number = Math.round( number * Math.pow(10, laenge) ) / Math.pow(10, laenge);
+  str_number = number+"";
+  arr_int = str_number.split(".");
+  if(!arr_int[0]) arr_int[0] = "0";
+  if(!arr_int[1]) arr_int[1] = "";
+  if(arr_int[1].length < laenge){
+    nachkomma = arr_int[1];
+    for(i=arr_int[1].length+1; i <= laenge; i++){  nachkomma += "0";  }
+    arr_int[1] = nachkomma;
+  }
+  if(th_sep != "" && arr_int[0].length > 3){
+    Begriff = arr_int[0];
+    arr_int[0] = "";
+    for(j = 3; j < Begriff.length ; j+=3){
+      Extrakt = Begriff.slice(Begriff.length - j, Begriff.length - j + 3);
+      arr_int[0] = th_sep + Extrakt +  arr_int[0] + "";
+    }
+    str_first = Begriff.substr(0, (Begriff.length % 3 == 0)?3:(Begriff.length % 3));
+    arr_int[0] = str_first + arr_int[0];
+  }
+  return arr_int[0]+sep+arr_int[1];
+}
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/calculate_qty_de.html b/templates/webpages/generic/calculate_qty_de.html
deleted file mode 100644 (file)
index 068f1cb..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr><td>Bitte geben Sie die Abmessungen unten ein</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       [% FOREACH col = HEADER %]
-        <th nowrap class="listheading">[% col.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH row = VARIABLES %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% HTML.escape(row.description) %]:</td><td><input id="[% row.name %]" name="[% row.name %]" value=""></td>
-        <td>[% HTML.escape(row.unit) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
- <button type="button" onclick="calculate_qty()">Berechnen</button>
- </form>
-
- <script type="text/javascript">
-  <!--//
-      function calculate_qty() {
-        [% FOREACH row = VARIABLES %]
-        var [% row.name %] = document.getElementsByName("[% row.name %]")[0].value.replace(/,/g, ".");
-       [% END %]
-        var result = [% formel %];
-        result = number_format(result, 2, ",", ".");
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = result;
-        self.close();
-      }
-      //-->
-
-function /*out: String*/ number_format( /* in: float   */ number, 
-                                        /* in: integer */ laenge, 
-                                        /* in: String  */ sep, 
-                                        /* in: String  */ th_sep ) {
-
-  number = Math.round( number * Math.pow(10, laenge) ) / Math.pow(10, laenge);
-  str_number = number+"";
-  arr_int = str_number.split(".");
-  if(!arr_int[0]) arr_int[0] = "0";
-  if(!arr_int[1]) arr_int[1] = "";
-  if(arr_int[1].length < laenge){
-    nachkomma = arr_int[1];
-    for(i=arr_int[1].length+1; i <= laenge; i++){  nachkomma += "0";  }
-    arr_int[1] = nachkomma;
-  }
-  if(th_sep != "" && arr_int[0].length > 3){
-    Begriff = arr_int[0];
-    arr_int[0] = "";
-    for(j = 3; j < Begriff.length ; j+=3){
-      Extrakt = Begriff.slice(Begriff.length - j, Begriff.length - j + 3);
-      arr_int[0] = th_sep + Extrakt +  arr_int[0] + "";
-    }
-    str_first = Begriff.substr(0, (Begriff.length % 3 == 0)?3:(Begriff.length % 3));
-    arr_int[0] = str_first + arr_int[0];
-  }
-  return arr_int[0]+sep+arr_int[1];
-}
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/calculate_qty_en.html b/templates/webpages/generic/calculate_qty_en.html
deleted file mode 100644 (file)
index 59f49dc..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr><td>Please insert object dimensions below.</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       [% FOREACH col = HEADER %]
-        <th nowrap class="listheading">[% col.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH row = VARIABLES %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% HTML.escape(row.description) %]:</td><td><input id="[% row.name %]" name="[% row.name %]" value=""></td>
-        <td>[% HTML.escape(row.unit) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
- <button type="button" onclick="calculate_qty()">Calculate</button>
- </form>
-
- <script type="text/javascript">
-  <!--//
-      function calculate_qty() {
-        [% FOREACH row = VARIABLES %]
-        var [% row.name %] = document.getElementsByName("[% row.name %]")[0].value.replace(/,/g, ".");
-       [% END %]
-        var result = [% formel %];
-        result = number_format(result, 2, ",", ".");
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = result;
-        self.close();
-      }
-      //-->
-
-function /*out: String*/ number_format( /* in: float   */ number, 
-                                        /* in: integer */ laenge, 
-                                        /* in: String  */ sep, 
-                                        /* in: String  */ th_sep ) {
-
-  number = Math.round( number * Math.pow(10, laenge) ) / Math.pow(10, laenge);
-  str_number = number+"";
-  arr_int = str_number.split(".");
-  if(!arr_int[0]) arr_int[0] = "0";
-  if(!arr_int[1]) arr_int[1] = "";
-  if(arr_int[1].length < laenge){
-    nachkomma = arr_int[1];
-    for(i=arr_int[1].length+1; i <= laenge; i++){  nachkomma += "0";  }
-    arr_int[1] = nachkomma;
-  }
-  if(th_sep != "" && arr_int[0].length > 3){
-    Begriff = arr_int[0];
-    arr_int[0] = "";
-    for(j = 3; j < Begriff.length ; j+=3){
-      Extrakt = Begriff.slice(Begriff.length - j, Begriff.length - j + 3);
-      arr_int[0] = th_sep + Extrakt +  arr_int[0] + "";
-    }
-    str_first = Begriff.substr(0, (Begriff.length % 3 == 0)?3:(Begriff.length % 3));
-    arr_int[0] = str_first + arr_int[0];
-  }
-  return arr_int[0]+sep+arr_int[1];
-}
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/calculate_qty_master.html b/templates/webpages/generic/calculate_qty_master.html
deleted file mode 100644 (file)
index 63c7823..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr><td><translate>Please insert object dimensions below.</translate></td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       [% FOREACH col = HEADER %]
-        <th nowrap class="listheading">[% col.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH row = VARIABLES %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% HTML.escape(row.description) %]:</td><td><input id="[% row.name %]" name="[% row.name %]" value=""></td>
-        <td>[% HTML.escape(row.unit) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
- <button type="button" onclick="calculate_qty()"><translate>Calculate</translate></button>
- </form>
-
- <script type="text/javascript">
-  <!--//
-      function calculate_qty() {
-        [% FOREACH row = VARIABLES %]
-        var [% row.name %] = document.getElementsByName("[% row.name %]")[0].value.replace(/,/g, ".");
-       [% END %]
-        var result = [% formel %];
-        result = number_format(result, 2, ",", ".");
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = result;
-        self.close();
-      }
-      //-->
-
-function /*out: String*/ number_format( /* in: float   */ number, 
-                                        /* in: integer */ laenge, 
-                                        /* in: String  */ sep, 
-                                        /* in: String  */ th_sep ) {
-
-  number = Math.round( number * Math.pow(10, laenge) ) / Math.pow(10, laenge);
-  str_number = number+"";
-  arr_int = str_number.split(".");
-  if(!arr_int[0]) arr_int[0] = "0";
-  if(!arr_int[1]) arr_int[1] = "";
-  if(arr_int[1].length < laenge){
-    nachkomma = arr_int[1];
-    for(i=arr_int[1].length+1; i <= laenge; i++){  nachkomma += "0";  }
-    arr_int[1] = nachkomma;
-  }
-  if(th_sep != "" && arr_int[0].length > 3){
-    Begriff = arr_int[0];
-    arr_int[0] = "";
-    for(j = 3; j < Begriff.length ; j+=3){
-      Extrakt = Begriff.slice(Begriff.length - j, Begriff.length - j + 3);
-      arr_int[0] = th_sep + Extrakt +  arr_int[0] + "";
-    }
-    str_first = Begriff.substr(0, (Begriff.length % 3 == 0)?3:(Begriff.length % 3));
-    arr_int[0] = str_first + arr_int[0];
-  }
-  return arr_int[0]+sep+arr_int[1];
-}
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/cov_selection.html b/templates/webpages/generic/cov_selection.html
new file mode 100644 (file)
index 0000000..f3cdbcd
--- /dev/null
@@ -0,0 +1,104 @@
+[%- USE T8 %]
+[%- USE HTML %]
+<body[% IF onload %] onload="[% onload %]"[% END %]>
+
+ <form method="post">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+  <input type="hidden" name="is_vendor" value="[% HTML.escape(is_vendor) %]">
+  <input type="hidden" name="allow_both" value="[% HTML.escape(allow_both) %]">
+  <input type="hidden" name="action_on_cov_selected" value="[% HTML.escape(action_on_cov_selected) %]">
+
+  <table width="100%">
+   <tr>
+    <th class="listtop">[% title %]</th>
+   </tr>
+   <tr height="5"></tr>
+
+   <tr>
+    <td>
+     [%- IF !is_vendor %]
+      [% 'Please select a customer from the list below.' | $T8 %]
+     [%- ELSE %]
+      [% 'Please select a vendor from the list below.' | $T8 %]
+     [%- END %]
+    </td>
+   </tr>
+
+   <tr>
+    <td>
+
+     <table>
+      <tr class="listheading">
+       <th class="listheading">&nbsp;</th>
+       [%- FOREACH row = HEADER %]
+        <th nowrap class="listheading"><a href="[% HTML.escape(row.callback) %]">[% row.column_title %]</a></th>
+       [%- END %]
+      </tr>
+
+      [%- FOREACH row = COVS %]
+       <tr class="listrow[% loop.count % 2 %]">
+        <td valign="top"><button type="button" onclick="cov_selected('[% loop.count %]')">Auswahl</button></td>
+        <td valign="top"><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+         <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+         <input type="hidden" id="customer_is_vendor_[% loop.count %]" name="customer_is_vendor_[% loop.count %]" value="[% HTML.escape(row.customer_is_vendor) %]">
+         [% HTML.escape(row.name) %]</td>
+        <td valign="top">[% HTML.escape(row.address) %]</td>
+        <td valign="top">[% HTML.escape(row.contact) %]</td>
+       </tr>
+      [% END %]
+     </table>
+
+    </td>
+   </tr>
+  </table>
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function cov_selected(selected) {
+        var name = document.getElementsByName("name_" + selected)[0].value
+        var id = document.getElementsByName("id_" + selected)[0].value
+        var customer_is_vendor = document.getElementsByName("customer_is_vendor_" + selected)[0].value
+        var cov_name = document.forms[0].input_name.value;
+        window.opener.document.getElementsByName(cov_name)[0].value = name;
+        if (document.forms[0].input_id.value != "") {
+          window.opener.document.getElementsByName(document.forms[0].input_id.value)[0].value = id;
+        }
+
+        var cov_is_vendor = cov_name + "_is_vendor";
+        var input = window.opener.document.getElementsByName(cov_is_vendor)[0];
+        if (input) {
+          input.value = customer_is_vendor;
+        }
+
+        var prefix = "";
+        if (cov_name.substr(0, 2) == "f_") {
+          prefix = "f_";
+          cov_name = cov_name.substr(2);
+        }
+        cov_name = prefix + "old_" + cov_name;
+        var input = window.opener.document.getElementsByName(cov_name)[0];
+        if (input) {
+          input.value = name;
+        }
+        cov_name = prefix + "old" + cov_name;
+        input = window.opener.document.getElementsByName(cov_name)[0];
+        if (input) {
+          input.value = name;
+        }
+
+        if (document.forms[0].action_on_cov_selected.value != "") {
+          window.opener.document.getElementsByName("action")[0].value = document.forms[0].action_on_cov_selected.value;
+          window.opener.document.forms[0].submit();
+        }
+
+        self.close();
+      }
+      //-->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/cov_selection_de.html b/templates/webpages/generic/cov_selection_de.html
deleted file mode 100644 (file)
index 0be4e1a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-[%- USE HTML %]
-<body[% IF onload %] onload="[% onload %]"[% END %]>
-
- <form method="post">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-  <input type="hidden" name="is_vendor" value="[% HTML.escape(is_vendor) %]">
-  <input type="hidden" name="allow_both" value="[% HTML.escape(allow_both) %]">
-  <input type="hidden" name="action_on_cov_selected" value="[% HTML.escape(action_on_cov_selected) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     [%- IF !is_vendor %]
-      Bitte einen Endkunden aus der Liste auswählen
-     [%- ELSE %]
-      Bitte einen Händler aus der Liste auswählen
-     [%- END %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH row = HEADER %]
-        <th nowrap class="listheading"><a href="[% HTML.escape(row.callback) %]">[% row.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = COVS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td valign="top"><button type="button" onclick="cov_selected('[% loop.count %]')">Auswahl</button></td>
-        <td valign="top"><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-         <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-         <input type="hidden" id="customer_is_vendor_[% loop.count %]" name="customer_is_vendor_[% loop.count %]" value="[% HTML.escape(row.customer_is_vendor) %]">
-         [% HTML.escape(row.name) %]</td>
-        <td valign="top">[% HTML.escape(row.address) %]</td>
-        <td valign="top">[% HTML.escape(row.contact) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function cov_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        var customer_is_vendor = document.getElementsByName("customer_is_vendor_" + selected)[0].value
-        var cov_name = document.forms[0].input_name.value;
-        window.opener.document.getElementsByName(cov_name)[0].value = name;
-        if (document.forms[0].input_id.value != "") {
-          window.opener.document.getElementsByName(document.forms[0].input_id.value)[0].value = id;
-        }
-
-        var cov_is_vendor = cov_name + "_is_vendor";
-        var input = window.opener.document.getElementsByName(cov_is_vendor)[0];
-        if (input) {
-          input.value = customer_is_vendor;
-        }
-
-        var prefix = "";
-        if (cov_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          cov_name = cov_name.substr(2);
-        }
-        cov_name = prefix + "old_" + cov_name;
-        var input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-        cov_name = prefix + "old" + cov_name;
-        input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        if (document.forms[0].action_on_cov_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.forms[0].action_on_cov_selected.value;
-          window.opener.document.forms[0].submit();
-        }
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/cov_selection_en.html b/templates/webpages/generic/cov_selection_en.html
deleted file mode 100644 (file)
index ee33b92..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-[%- USE HTML %]
-<body[% IF onload %] onload="[% onload %]"[% END %]>
-
- <form method="post">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-  <input type="hidden" name="is_vendor" value="[% HTML.escape(is_vendor) %]">
-  <input type="hidden" name="allow_both" value="[% HTML.escape(allow_both) %]">
-  <input type="hidden" name="action_on_cov_selected" value="[% HTML.escape(action_on_cov_selected) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     [%- IF !is_vendor %]
-      Please select a customer from the list below.
-     [%- ELSE %]
-      Please select a vendor from the list below.
-     [%- END %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH row = HEADER %]
-        <th nowrap class="listheading"><a href="[% HTML.escape(row.callback) %]">[% row.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = COVS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td valign="top"><button type="button" onclick="cov_selected('[% loop.count %]')">Auswahl</button></td>
-        <td valign="top"><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-         <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-         <input type="hidden" id="customer_is_vendor_[% loop.count %]" name="customer_is_vendor_[% loop.count %]" value="[% HTML.escape(row.customer_is_vendor) %]">
-         [% HTML.escape(row.name) %]</td>
-        <td valign="top">[% HTML.escape(row.address) %]</td>
-        <td valign="top">[% HTML.escape(row.contact) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function cov_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        var customer_is_vendor = document.getElementsByName("customer_is_vendor_" + selected)[0].value
-        var cov_name = document.forms[0].input_name.value;
-        window.opener.document.getElementsByName(cov_name)[0].value = name;
-        if (document.forms[0].input_id.value != "") {
-          window.opener.document.getElementsByName(document.forms[0].input_id.value)[0].value = id;
-        }
-
-        var cov_is_vendor = cov_name + "_is_vendor";
-        var input = window.opener.document.getElementsByName(cov_is_vendor)[0];
-        if (input) {
-          input.value = customer_is_vendor;
-        }
-
-        var prefix = "";
-        if (cov_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          cov_name = cov_name.substr(2);
-        }
-        cov_name = prefix + "old_" + cov_name;
-        var input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-        cov_name = prefix + "old" + cov_name;
-        input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        if (document.forms[0].action_on_cov_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.forms[0].action_on_cov_selected.value;
-          window.opener.document.forms[0].submit();
-        }
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/cov_selection_master.html b/templates/webpages/generic/cov_selection_master.html
deleted file mode 100644 (file)
index 336587e..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-[%- USE HTML %]
-<body[% IF onload %] onload="[% onload %]"[% END %]>
-
- <form method="post">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-  <input type="hidden" name="is_vendor" value="[% HTML.escape(is_vendor) %]">
-  <input type="hidden" name="allow_both" value="[% HTML.escape(allow_both) %]">
-  <input type="hidden" name="action_on_cov_selected" value="[% HTML.escape(action_on_cov_selected) %]">
-
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
-   <tr>
-    <td>
-     [%- IF !is_vendor %]
-      <translate>Please select a customer from the list below.</translate>
-     [%- ELSE %]
-      <translate>Please select a vendor from the list below.</translate>
-     [%- END %]
-    </td>
-   </tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH row = HEADER %]
-        <th nowrap class="listheading"><a href="[% HTML.escape(row.callback) %]">[% row.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = COVS %]
-       <tr class="listrow[% loop.count % 2 %]">
-        <td valign="top"><button type="button" onclick="cov_selected('[% loop.count %]')">Auswahl</button></td>
-        <td valign="top"><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-         <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-         <input type="hidden" id="customer_is_vendor_[% loop.count %]" name="customer_is_vendor_[% loop.count %]" value="[% HTML.escape(row.customer_is_vendor) %]">
-         [% HTML.escape(row.name) %]</td>
-        <td valign="top">[% HTML.escape(row.address) %]</td>
-        <td valign="top">[% HTML.escape(row.contact) %]</td>
-       </tr>
-      [% END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function cov_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        var customer_is_vendor = document.getElementsByName("customer_is_vendor_" + selected)[0].value
-        var cov_name = document.forms[0].input_name.value;
-        window.opener.document.getElementsByName(cov_name)[0].value = name;
-        if (document.forms[0].input_id.value != "") {
-          window.opener.document.getElementsByName(document.forms[0].input_id.value)[0].value = id;
-        }
-
-        var cov_is_vendor = cov_name + "_is_vendor";
-        var input = window.opener.document.getElementsByName(cov_is_vendor)[0];
-        if (input) {
-          input.value = customer_is_vendor;
-        }
-
-        var prefix = "";
-        if (cov_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          cov_name = cov_name.substr(2);
-        }
-        cov_name = prefix + "old_" + cov_name;
-        var input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-        cov_name = prefix + "old" + cov_name;
-        input = window.opener.document.getElementsByName(cov_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        if (document.forms[0].action_on_cov_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.forms[0].action_on_cov_selected.value;
-          window.opener.document.forms[0].submit();
-        }
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/edit_email.html b/templates/webpages/generic/edit_email.html
new file mode 100644 (file)
index 0000000..9aec0ca
--- /dev/null
@@ -0,0 +1,76 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="fokus()">
+
+<form name="Form" method="post" action="[% script %]">
+
+<table width="100%">
+  <tr class="listtop">
+
+    <th class="listtop">[% title %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <th align="right" nowrap>[% 'To' | $T8 %]</th>
+
+          <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Cc' | $T8 %]</th>
+          <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
+        </tr>
+[% IF SHOW_BCC %]
+        <tr>
+          <th align="right" nowrap>[% 'Bcc' | $T8 %]</th>
+          <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
+        </tr>[% END %]
+        <tr>
+          <th align="right" nowrap>[% 'Subject' | $T8 %]</th>
+
+          <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Attachment name' | $T8 %]</th>
+          <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <th align="left" nowrap>[% 'Message' | $T8 %]</th>
+        </tr>
+        <tr>
+          <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
+
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+
+[% print_options %]
+[% FOREACH row = HIDDEN %]<input type="hidden" name="[% row.name %]" value="[% HTML.escape(row.value) %]">
+[% END %]
+
+    </td>
+  </tr>
+
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+</table>
+
+<input type="hidden" name="nextsub" value="send_email">
+
+<br>
+<input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/edit_email_de.html b/templates/webpages/generic/edit_email_de.html
deleted file mode 100644 (file)
index 3640be1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
-<form name="Form" method="post" action="[% script %]">
-
-<table width="100%">
-  <tr class="listtop">
-
-    <th class="listtop">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap>An</th>
-
-          <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Cc</th>
-          <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
-        </tr>
-[% IF SHOW_BCC %]
-        <tr>
-          <th align="right" nowrap>Bcc</th>
-          <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
-        </tr>[% END %]
-        <tr>
-          <th align="right" nowrap>Betreff</th>
-
-          <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Name des Anhangs</th>
-          <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="left" nowrap>Nachricht</th>
-        </tr>
-        <tr>
-          <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
-
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-
-[% print_options %]
-[% FOREACH row = HIDDEN %]<input type="hidden" name="[% row.name %]" value="[% HTML.escape(row.value) %]">
-[% END %]
-
-    </td>
-  </tr>
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-</table>
-
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="Weiter">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/edit_email_en.html b/templates/webpages/generic/edit_email_en.html
deleted file mode 100644 (file)
index 52291fd..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
-<form name="Form" method="post" action="[% script %]">
-
-<table width="100%">
-  <tr class="listtop">
-
-    <th class="listtop">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap>To</th>
-
-          <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Cc</th>
-          <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
-        </tr>
-[% IF SHOW_BCC %]
-        <tr>
-          <th align="right" nowrap>Bcc</th>
-          <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
-        </tr>[% END %]
-        <tr>
-          <th align="right" nowrap>Subject</th>
-
-          <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Attachment name</th>
-          <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="left" nowrap>Message</th>
-        </tr>
-        <tr>
-          <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
-
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-
-[% print_options %]
-[% FOREACH row = HIDDEN %]<input type="hidden" name="[% row.name %]" value="[% HTML.escape(row.value) %]">
-[% END %]
-
-    </td>
-  </tr>
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-</table>
-
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="Continue">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/edit_email_master.html b/templates/webpages/generic/edit_email_master.html
deleted file mode 100644 (file)
index cf1cc4c..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-[% USE HTML %]<body onload="fokus()">
-
-<form name="Form" method="post" action="[% script %]">
-
-<table width="100%">
-  <tr class="listtop">
-
-    <th class="listtop">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap><translate>To</translate></th>
-
-          <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Cc</translate></th>
-          <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
-        </tr>
-[% IF SHOW_BCC %]
-        <tr>
-          <th align="right" nowrap><translate>Bcc</translate></th>
-          <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
-        </tr>[% END %]
-        <tr>
-          <th align="right" nowrap><translate>Subject</translate></th>
-
-          <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Attachment name</translate></th>
-          <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="left" nowrap><translate>Message</translate></th>
-        </tr>
-        <tr>
-          <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
-
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-
-[% print_options %]
-[% FOREACH row = HIDDEN %]<input type="hidden" name="[% row.name %]" value="[% HTML.escape(row.value) %]">
-[% END %]
-
-    </td>
-  </tr>
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-</table>
-
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="<translate>Continue</translate>">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/error.html b/templates/webpages/generic/error.html
new file mode 100644 (file)
index 0000000..6282085
--- /dev/null
@@ -0,0 +1,33 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop">[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]</div>
+
+ <p>[% label_error %]</p>
+
+ [%- IF SHOW_BACK_BUTTON %]
+ <form>
+  <p>
+   <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+ [%- ELSIF SHOW_BUTTON %]
+
+ <form action="[% HTML.escape(script) %]" method="post">
+
+  [%- FOREACH var = VARIABLES %]
+  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
+
+  <p>
+   <input type="submit" value="[% BUTTON_LABEL %]">
+  </p>
+ </form>
+
+ [%- END %]
+
+</body>
+</html>
diff --git a/templates/webpages/generic/error_de.html b/templates/webpages/generic/error_de.html
deleted file mode 100644 (file)
index f95bb3a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]Fehler![% END %]</div>
-
- <p>[% label_error %]</p>
-
- [%- IF SHOW_BACK_BUTTON %]
- <form>
-  <p>
-   <input type="button" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-
- [%- ELSIF SHOW_BUTTON %]
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  [%- FOREACH var = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-
-  <p>
-   <input type="submit" value="[% BUTTON_LABEL %]">
-  </p>
- </form>
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/generic/error_en.html b/templates/webpages/generic/error_en.html
deleted file mode 100644 (file)
index 8b78376..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]Error![% END %]</div>
-
- <p>[% label_error %]</p>
-
- [%- IF SHOW_BACK_BUTTON %]
- <form>
-  <p>
-   <input type="button" onclick="history.back()" value="Back">
-  </p>
- </form>
-
- [%- ELSIF SHOW_BUTTON %]
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  [%- FOREACH var = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-
-  <p>
-   <input type="submit" value="[% BUTTON_LABEL %]">
-  </p>
- </form>
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/generic/error_master.html b/templates/webpages/generic/error_master.html
deleted file mode 100644 (file)
index 5ca71e2..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]<translate>Error!</translate>[% END %]</div>
-
- <p>[% label_error %]</p>
-
- [%- IF SHOW_BACK_BUTTON %]
- <form>
-  <p>
-   <input type="button" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-
- [%- ELSIF SHOW_BUTTON %]
-
- <form action="[% HTML.escape(script) %]" method="post">
-
-  [%- FOREACH var = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
-
-  <p>
-   <input type="submit" value="[% BUTTON_LABEL %]">
-  </p>
- </form>
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/generic/information.html b/templates/webpages/generic/information.html
new file mode 100644 (file)
index 0000000..29e4171
--- /dev/null
@@ -0,0 +1,13 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+ <table width="100%">
+  <tr>
+   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]</th>
+  </tr>
+  <tr height="5"></tr>
+
+  <tr><td>[% label_information %]</td></tr>
+ </table>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/information_de.html b/templates/webpages/generic/information_de.html
deleted file mode 100644 (file)
index ad01854..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body>
- <table width="100%">
-  <tr>
-   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %]Information[% END %]</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td>[% label_information %]</td></tr>
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/information_en.html b/templates/webpages/generic/information_en.html
deleted file mode 100644 (file)
index ad01854..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body>
- <table width="100%">
-  <tr>
-   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %]Information[% END %]</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td>[% label_information %]</td></tr>
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/information_master.html b/templates/webpages/generic/information_master.html
deleted file mode 100644 (file)
index 91c0e96..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE HTML %]<body>
- <table width="100%">
-  <tr>
-   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %]<translate>Information</translate>[% END %]</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td>[% label_information %]</td></tr>
- </table>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/new_item.html b/templates/webpages/generic/new_item.html
new file mode 100644 (file)
index 0000000..1d3104a
--- /dev/null
@@ -0,0 +1,27 @@
+[%- USE T8 %]
+[% USE HTML %]  <body>
+
+    <h4 class="error">[% 'Item not on file!' | $T8 %]
+
+
+    <p>[% 'What type of item is this?' | $T8 %]</h4>
+
+    <form method="post" action="ic.pl">
+
+      <p>
+
+      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;[% 'Part' | $T8 %]<br>
+      <input class="radio" type="radio" name="item" value="service">&nbsp;[% 'Service' | $T8 %]
+      <p>
+
+      [%- FOREACH var = HIDDENS %]
+      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+      [%- END %]
+
+      <input type="hidden" name="nextsub" value="add">
+      <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+    </form>
+
+  </body>
+</html>
+
diff --git a/templates/webpages/generic/new_item_de.html b/templates/webpages/generic/new_item_de.html
deleted file mode 100644 (file)
index dc39580..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[% USE HTML %]  <body>
-
-    <h4 class="error">Dieser Artikel ist nicht in der Datenbank!
-
-
-    <p>Was ist dieser Artikel?</h4>
-
-    <form method="post" action="ic.pl">
-
-      <p>
-
-      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;Ware<br>
-      <input class="radio" type="radio" name="item" value="service">&nbsp;Dienstleistung
-      <p>
-
-      [%- FOREACH var = HIDDENS %]
-      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-      [%- END %]
-
-      <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="Weiter">
-    </form>
-
-  </body>
-</html>
-
diff --git a/templates/webpages/generic/new_item_en.html b/templates/webpages/generic/new_item_en.html
deleted file mode 100644 (file)
index 421df6a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[% USE HTML %]  <body>
-
-    <h4 class="error">Item not on file!
-
-
-    <p>What type of item is this?</h4>
-
-    <form method="post" action="ic.pl">
-
-      <p>
-
-      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;Part<br>
-      <input class="radio" type="radio" name="item" value="service">&nbsp;Service
-      <p>
-
-      [%- FOREACH var = HIDDENS %]
-      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-      [%- END %]
-
-      <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="Continue">
-    </form>
-
-  </body>
-</html>
-
diff --git a/templates/webpages/generic/new_item_master.html b/templates/webpages/generic/new_item_master.html
deleted file mode 100644 (file)
index 45235ec..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[% USE HTML %]  <body>
-
-    <h4 class="error"><translate>Item not on file!</translate>
-
-
-    <p><translate>What type of item is this?</translate></h4>
-
-    <form method="post" action="ic.pl">
-
-      <p>
-
-      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;<translate>Part</translate><br>
-      <input class="radio" type="radio" name="item" value="service">&nbsp;<translate>Service</translate>
-      <p>
-
-      [%- FOREACH var = HIDDENS %]
-      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
-      [%- END %]
-
-      <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-    </form>
-
-  </body>
-</html>
-
diff --git a/templates/webpages/generic/part_selection.html b/templates/webpages/generic/part_selection.html
new file mode 100644 (file)
index 0000000..ac4aa4a
--- /dev/null
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
+
+ <form action="[% HTML.escape(script) %]" method="post" name="Form">
+
+  <input type="hidden" name="input_partnumber" value="[% HTML.escape(input_partnumber) %]">
+  <input type="hidden" name="input_description" value="[% HTML.escape(input_description) %]">
+  <input type="hidden" name="input_partsid" value="[% HTML.escape(input_partsid) %]">
+  <input type="hidden" name="input_partnotes" value="[% HTML.escape(input_partnotes) %]">
+  <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
+  <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
+  <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
+  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
+  <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr>
+    <td>
+     [% 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 %]
+    </td>
+   </tr>
+
+   [% UNLESS no_parts_found %]
+   <tr>
+    <td>
+     <table>
+      <tr class="listheading">
+       <th class="listheading">&nbsp;</th>
+       [% FOREACH header = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(header.callback) %]">[% header.column_title %]</a></th>
+       [% END %]
+      </tr>
+
+      [% FOREACH part = PARTS %]
+      <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
+       <td><button type="button" onclick="part_selected('[% loop.count %]')">[% 'Select' | $T8 %]</button></td>
+       <td>
+        <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
+        <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
+        [% HTML.escape(part.partnumber) %]
+       </td>
+       <td>
+        <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
+        <input type="hidden" id="partnotes_[% loop.count %]" name="partnotes_[% loop.count %]" value="[% HTML.escape(part.partnotes) %]">
+        [% HTML.escape(part.description) %]
+       </td>
+<!--        <td> -->
+<!--         <input type="hidden" id="onhand_[% loop.count %]" name="onhand_[% loop.count %]" value="[% HTML.escape(part.onhand) %]"> -->
+<!--         [% HTML.escape(part.onhand) %] -->
+<!--        </td> -->
+      </tr>
+      [% END %]
+     </table>
+    </td>
+   </tr>
+   [% END %]
+  </table>
+
+  [% IF allow_creation %]
+  <p><input type="submit" name="action" value="[% 'New part' | $T8 %]"></p>
+  [% END %]
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function part_selected(selected) {
+        var partnumber = document.getElementsByName("partnumber_" + selected)[0].value;
+        var description = document.getElementsByName("description_" + selected)[0].value;
+        var partsid = document.getElementsByName("partsid_" + selected)[0].value;
+        var partnotes = document.getElementsByName("partnotes_" + selected)[0].value;
+        var pnum_name = document.Form.input_partnumber.value;
+        window.opener.document.getElementsByName(pnum_name)[0].value = partnumber;
+        window.opener.document.getElementsByName(document.Form.input_description.value)[0].value = description;
+        if (document.Form.input_partsid.value != "") {
+          window.opener.document.getElementsByName(document.Form.input_partsid.value)[0].value = partsid;
+        }
+        if (document.Form.input_partnotes.value != "") {
+          var el = window.opener.document.getElementsByName(document.Form.input_partnotes.value)[0];
+          if (el)
+            el.value = partnotes;
+        }
+        if (document.Form.action_on_part_selected.value != "") {
+          window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
+          window.opener.document.[% formname %].submit();
+        }
+
+
+        var prefix = "";
+        if (pnum_name.substr(0, 2) == "f_") {
+          prefix = "f_";
+          pnum_name = pnum_name.substr(2);
+        }
+        pnum_name = prefix + "old_" + pnum_name;
+        var input = window.opener.document.getElementsByName(pnum_name)[0];
+        if (input) {
+          input.value = name;
+        }
+
+        [%- IF click_button %]
+        window.opener.document.[% formname %].[% click_button %].click();
+        [%- END %]
+
+        self.close();
+      }
+      //-->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/part_selection_de.html b/templates/webpages/generic/part_selection_de.html
deleted file mode 100644 (file)
index 4569bef..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form action="[% HTML.escape(script) %]" method="post" name="Form">
-
-  <input type="hidden" name="input_partnumber" value="[% HTML.escape(input_partnumber) %]">
-  <input type="hidden" name="input_description" value="[% HTML.escape(input_description) %]">
-  <input type="hidden" name="input_partsid" value="[% HTML.escape(input_partsid) %]">
-  <input type="hidden" name="input_partnotes" value="[% HTML.escape(input_partnotes) %]">
-  <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
-  <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
-  <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
-  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
-  <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     [% IF no_parts_found %]
-     Es wurde kein Artikel gefunden, auf den die Suchparameter zutreffen.
-     [% IF allow_creation %]
-     Sie k&ouml;nnen jedoch einen neuen Artikel anlegen, der dann automatisch ausgew&auml;hlt wird.
-     [% END %]
-     [% ELSE %]
-     Bitte w&auml;hlen Sie einen Artikel aus der Liste aus.
-     [% IF allow_creation %]
-     Sie k&ouml;nnen auch einen neuen Artikel anlegen, der dann automatisch ausgew&auml;hlt wird.
-     [% END %]
-     [% END %]
-    </td>
-   </tr>
-
-   [% UNLESS no_parts_found %]
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [% FOREACH header = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(header.callback) %]">[% header.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH part = PARTS %]
-      <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
-       <td><button type="button" onclick="part_selected('[% loop.count %]')">auswählen</button></td>
-       <td>
-        <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-        <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
-        [% HTML.escape(part.partnumber) %]
-       </td>
-       <td>
-        <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-        <input type="hidden" id="partnotes_[% loop.count %]" name="partnotes_[% loop.count %]" value="[% HTML.escape(part.partnotes) %]">
-        [% HTML.escape(part.description) %]
-       </td>
-<!--        <td> -->
-<!--         <input type="hidden" id="onhand_[% loop.count %]" name="onhand_[% loop.count %]" value="[% HTML.escape(part.onhand) %]"> -->
-<!--         [% HTML.escape(part.onhand) %] -->
-<!--        </td> -->
-      </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-   [% END %]
-  </table>
-
-  [% IF allow_creation %]
-  <p><input type="submit" name="action" value="Neue Ware"></p>
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function part_selected(selected) {
-        var partnumber = document.getElementsByName("partnumber_" + selected)[0].value;
-        var description = document.getElementsByName("description_" + selected)[0].value;
-        var partsid = document.getElementsByName("partsid_" + selected)[0].value;
-        var partnotes = document.getElementsByName("partnotes_" + selected)[0].value;
-        var pnum_name = document.Form.input_partnumber.value;
-        window.opener.document.getElementsByName(pnum_name)[0].value = partnumber;
-        window.opener.document.getElementsByName(document.Form.input_description.value)[0].value = description;
-        if (document.Form.input_partsid.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_partsid.value)[0].value = partsid;
-        }
-        if (document.Form.input_partnotes.value != "") {
-          var el = window.opener.document.getElementsByName(document.Form.input_partnotes.value)[0];
-          if (el)
-            el.value = partnotes;
-        }
-        if (document.Form.action_on_part_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
-          window.opener.document.[% formname %].submit();
-        }
-
-
-        var prefix = "";
-        if (pnum_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          pnum_name = pnum_name.substr(2);
-        }
-        pnum_name = prefix + "old_" + pnum_name;
-        var input = window.opener.document.getElementsByName(pnum_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        [%- IF click_button %]
-        window.opener.document.[% formname %].[% click_button %].click();
-        [%- END %]
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/part_selection_en.html b/templates/webpages/generic/part_selection_en.html
deleted file mode 100644 (file)
index 9dd7dd3..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form action="[% HTML.escape(script) %]" method="post" name="Form">
-
-  <input type="hidden" name="input_partnumber" value="[% HTML.escape(input_partnumber) %]">
-  <input type="hidden" name="input_description" value="[% HTML.escape(input_description) %]">
-  <input type="hidden" name="input_partsid" value="[% HTML.escape(input_partsid) %]">
-  <input type="hidden" name="input_partnotes" value="[% HTML.escape(input_partnotes) %]">
-  <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
-  <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
-  <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
-  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
-  <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     [% IF no_parts_found %]
-     No part was found matching the search parameters.
-     [% IF allow_creation %]
-     However, you can create a new part which will then be selected.
-     [% END %]
-     [% ELSE %]
-     Please select a part from the list below.
-     [% IF allow_creation %]
-     Alternatively you can create a new part which will then be selected.
-     [% END %]
-     [% END %]
-    </td>
-   </tr>
-
-   [% UNLESS no_parts_found %]
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [% FOREACH header = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(header.callback) %]">[% header.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH part = PARTS %]
-      <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
-       <td><button type="button" onclick="part_selected('[% loop.count %]')">Select</button></td>
-       <td>
-        <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-        <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
-        [% HTML.escape(part.partnumber) %]
-       </td>
-       <td>
-        <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-        <input type="hidden" id="partnotes_[% loop.count %]" name="partnotes_[% loop.count %]" value="[% HTML.escape(part.partnotes) %]">
-        [% HTML.escape(part.description) %]
-       </td>
-<!--        <td> -->
-<!--         <input type="hidden" id="onhand_[% loop.count %]" name="onhand_[% loop.count %]" value="[% HTML.escape(part.onhand) %]"> -->
-<!--         [% HTML.escape(part.onhand) %] -->
-<!--        </td> -->
-      </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-   [% END %]
-  </table>
-
-  [% IF allow_creation %]
-  <p><input type="submit" name="action" value="New part"></p>
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function part_selected(selected) {
-        var partnumber = document.getElementsByName("partnumber_" + selected)[0].value;
-        var description = document.getElementsByName("description_" + selected)[0].value;
-        var partsid = document.getElementsByName("partsid_" + selected)[0].value;
-        var partnotes = document.getElementsByName("partnotes_" + selected)[0].value;
-        var pnum_name = document.Form.input_partnumber.value;
-        window.opener.document.getElementsByName(pnum_name)[0].value = partnumber;
-        window.opener.document.getElementsByName(document.Form.input_description.value)[0].value = description;
-        if (document.Form.input_partsid.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_partsid.value)[0].value = partsid;
-        }
-        if (document.Form.input_partnotes.value != "") {
-          var el = window.opener.document.getElementsByName(document.Form.input_partnotes.value)[0];
-          if (el)
-            el.value = partnotes;
-        }
-        if (document.Form.action_on_part_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
-          window.opener.document.[% formname %].submit();
-        }
-
-
-        var prefix = "";
-        if (pnum_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          pnum_name = pnum_name.substr(2);
-        }
-        pnum_name = prefix + "old_" + pnum_name;
-        var input = window.opener.document.getElementsByName(pnum_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        [%- IF click_button %]
-        window.opener.document.[% formname %].[% click_button %].click();
-        [%- END %]
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/part_selection_master.html b/templates/webpages/generic/part_selection_master.html
deleted file mode 100644 (file)
index 7eb7ef6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form action="[% HTML.escape(script) %]" method="post" name="Form">
-
-  <input type="hidden" name="input_partnumber" value="[% HTML.escape(input_partnumber) %]">
-  <input type="hidden" name="input_description" value="[% HTML.escape(input_description) %]">
-  <input type="hidden" name="input_partsid" value="[% HTML.escape(input_partsid) %]">
-  <input type="hidden" name="input_partnotes" value="[% HTML.escape(input_partnotes) %]">
-  <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
-  <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
-  <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
-  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
-  <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr>
-    <td>
-     [% IF no_parts_found %]
-     <translate>No part was found matching the search parameters.</translate>
-     [% IF allow_creation %]
-     <translate>However, you can create a new part which will then be selected.</translate>
-     [% END %]
-     [% ELSE %]
-     <translate>Please select a part from the list below.</translate>
-     [% IF allow_creation %]
-     <translate>Alternatively you can create a new part which will then be selected.</translate>
-     [% END %]
-     [% END %]
-    </td>
-   </tr>
-
-   [% UNLESS no_parts_found %]
-   <tr>
-    <td>
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [% FOREACH header = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(header.callback) %]">[% header.column_title %]</a></th>
-       [% END %]
-      </tr>
-
-      [% FOREACH part = PARTS %]
-      <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
-       <td><button type="button" onclick="part_selected('[% loop.count %]')"><translate>Select</translate></button></td>
-       <td>
-        <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-        <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
-        [% HTML.escape(part.partnumber) %]
-       </td>
-       <td>
-        <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-        <input type="hidden" id="partnotes_[% loop.count %]" name="partnotes_[% loop.count %]" value="[% HTML.escape(part.partnotes) %]">
-        [% HTML.escape(part.description) %]
-       </td>
-<!--        <td> -->
-<!--         <input type="hidden" id="onhand_[% loop.count %]" name="onhand_[% loop.count %]" value="[% HTML.escape(part.onhand) %]"> -->
-<!--         [% HTML.escape(part.onhand) %] -->
-<!--        </td> -->
-      </tr>
-      [% END %]
-     </table>
-    </td>
-   </tr>
-   [% END %]
-  </table>
-
-  [% IF allow_creation %]
-  <p><input type="submit" name="action" value="<translate>New part</translate>"></p>
-  [% END %]
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function part_selected(selected) {
-        var partnumber = document.getElementsByName("partnumber_" + selected)[0].value;
-        var description = document.getElementsByName("description_" + selected)[0].value;
-        var partsid = document.getElementsByName("partsid_" + selected)[0].value;
-        var partnotes = document.getElementsByName("partnotes_" + selected)[0].value;
-        var pnum_name = document.Form.input_partnumber.value;
-        window.opener.document.getElementsByName(pnum_name)[0].value = partnumber;
-        window.opener.document.getElementsByName(document.Form.input_description.value)[0].value = description;
-        if (document.Form.input_partsid.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_partsid.value)[0].value = partsid;
-        }
-        if (document.Form.input_partnotes.value != "") {
-          var el = window.opener.document.getElementsByName(document.Form.input_partnotes.value)[0];
-          if (el)
-            el.value = partnotes;
-        }
-        if (document.Form.action_on_part_selected.value != "") {
-          window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
-          window.opener.document.[% formname %].submit();
-        }
-
-
-        var prefix = "";
-        if (pnum_name.substr(0, 2) == "f_") {
-          prefix = "f_";
-          pnum_name = pnum_name.substr(2);
-        }
-        pnum_name = prefix + "old_" + pnum_name;
-        var input = window.opener.document.getElementsByName(pnum_name)[0];
-        if (input) {
-          input.value = name;
-        }
-
-        [%- IF click_button %]
-        window.opener.document.[% formname %].[% click_button %].click();
-        [%- END %]
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/print_options.html b/templates/webpages/generic/print_options.html
new file mode 100644 (file)
index 0000000..f8ee3ef
--- /dev/null
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+<table width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+  <td>
+   <table>
+    <tr>
+     <td>
+      [%- FOREACH row = SELECTS %]
+      [%- IF row.show %]
+      <select name="[% row.sname %]">
+       [%- FOREACH data = row.DATA %]
+       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
+       [%- END %]
+      </select>
+      [%- END %]
+      [%- END %]
+     </td>
+     [%- IF display_copies %]
+     <td>[% 'Copies' | $T8 %] <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     [%- END %]
+     [%- IF display_groupitems %]
+     <td>[% 'Group Items' | $T8 %]</td>
+     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
+     [%- END %]
+     [%- IF display_remove_draft %]
+     <td>[% 'Remove Draft' | $T8 %]</td>
+     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
+     [%- END %]
+    </tr>
+   </table>
+  </td>
+  <td align=right>
+   <table><tr><th>[% status_msg %]</th></tr></table>
+  </td>
+ </tr>
+</table>
+
diff --git a/templates/webpages/generic/print_options_de.html b/templates/webpages/generic/print_options_de.html
deleted file mode 100644 (file)
index b1906f5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[% USE HTML %]
-
-<table width="100%" cellspacing="0" cellpadding="0">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <td>
-      [%- FOREACH row = SELECTS %]
-      [%- IF row.show %]
-      <select name="[% row.sname %]">
-       [%- FOREACH data = row.DATA %]
-       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
-       [%- END %]
-      </select>
-      [%- END %]
-      [%- END %]
-     </td>
-     [%- IF display_copies %]
-     <td>Kopien <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
-     [%- END %]
-     [%- IF display_groupitems %]
-     <td>Waren gruppieren</td>
-     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
-     [%- END %]
-     [%- IF display_remove_draft %]
-     <td>Entwurf l&ouml;schen</td>
-     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
-     [%- END %]
-    </tr>
-   </table>
-  </td>
-  <td align=right>
-   <table><tr><th>[% status_msg %]</th></tr></table>
-  </td>
- </tr>
-</table>
-
diff --git a/templates/webpages/generic/print_options_en.html b/templates/webpages/generic/print_options_en.html
deleted file mode 100644 (file)
index 8e3c446..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[% USE HTML %]
-
-<table width="100%" cellspacing="0" cellpadding="0">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <td>
-      [%- FOREACH row = SELECTS %]
-      [%- IF row.show %]
-      <select name="[% row.sname %]">
-       [%- FOREACH data = row.DATA %]
-       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
-       [%- END %]
-      </select>
-      [%- END %]
-      [%- END %]
-     </td>
-     [%- IF display_copies %]
-     <td>Copies <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
-     [%- END %]
-     [%- IF display_groupitems %]
-     <td>Group Items</td>
-     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
-     [%- END %]
-     [%- IF display_remove_draft %]
-     <td>Remove Draft</td>
-     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
-     [%- END %]
-    </tr>
-   </table>
-  </td>
-  <td align=right>
-   <table><tr><th>[% status_msg %]</th></tr></table>
-  </td>
- </tr>
-</table>
-
diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
deleted file mode 100644 (file)
index 94a44b8..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[% USE HTML %]
-
-<table width="100%" cellspacing="0" cellpadding="0">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <td>
-      [%- FOREACH row = SELECTS %]
-      [%- IF row.show %]
-      <select name="[% row.sname %]">
-       [%- FOREACH data = row.DATA %]
-       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
-       [%- END %]
-      </select>
-      [%- END %]
-      [%- END %]
-     </td>
-     [%- IF display_copies %]
-     <td><translate>Copies</translate> <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
-     [%- END %]
-     [%- IF display_groupitems %]
-     <td><translate>Group Items</translate></td>
-     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
-     [%- END %]
-     [%- IF display_remove_draft %]
-     <td><translate>Remove Draft</translate></td>
-     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
-     [%- END %]
-    </tr>
-   </table>
-  </td>
-  <td align=right>
-   <table><tr><th>[% status_msg %]</th></tr></table>
-  </td>
- </tr>
-</table>
-
diff --git a/templates/webpages/generic/select_delivery_customer.html b/templates/webpages/generic/select_delivery_customer.html
new file mode 100644 (file)
index 0000000..20858c1
--- /dev/null
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <form name="Form">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+
+   <tr><td>[% 'Please select a customer from the list below.' | $T8 %]</td></tr>
+
+   <tr>
+    <td>
+
+     <table>
+      <tr class="listheading">
+       <th class="listheading">&nbsp;</th>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
+      </tr>
+
+      [%- FOREACH row = DELIVERY %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(row.name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
+     </table>
+
+    </td>
+   </tr>
+  </table>
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function customer_selected(selected) {
+        var name = document.getElementsByName("name_" + selected)[0].value
+        var id = document.getElementsByName("id_" + selected)[0].value
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
+        if (document.Form.input_id.value != "") {
+          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
+        }
+        self.close();
+      }
+      //-->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/select_delivery_customer_de.html b/templates/webpages/generic/select_delivery_customer_de.html
deleted file mode 100644 (file)
index e269df8..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td>Bitte einen Endkunden aus der Liste auswählen</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = DELIVERY %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(row.name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function customer_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_delivery_customer_en.html b/templates/webpages/generic/select_delivery_customer_en.html
deleted file mode 100644 (file)
index e86c4d7..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td>Please select a customer from the list below.</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = DELIVERY %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(row.name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function customer_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_delivery_customer_master.html b/templates/webpages/generic/select_delivery_customer_master.html
deleted file mode 100644 (file)
index 272934d..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td><translate>Please select a customer from the list below.</translate></td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = DELIVERY %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(row.name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function customer_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_part.html b/templates/webpages/generic/select_part.html
new file mode 100644 (file)
index 0000000..324c473
--- /dev/null
@@ -0,0 +1,85 @@
+[%- USE T8 %]
+[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
+
+ <form method="post" action="[% HTML.escape(script) %]">
+
+  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
+  <input type="hidden" name="callback_sub" value="[% HTML.escape(callback_sub) %]">
+
+  <input type="hidden" name="old_form" value="[% HTML.escape(old_form) %]">
+  <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
+  <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
+
+  <div class="listtop">[% 'Select a part or assembly' | $T8 %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">&nbsp;</th>
+     <th class="listheading">[% 'Number' | $T8 %]</th>
+     <th class="listheading">[% 'Description' | $T8 %]</th>
+     [% IF has_charge %]
+     <th class="listheading">[% 'Charge number' | $T8 %]</th>
+     [% END %]
+     [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     [% END %]
+     [% IF has_ean %]
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     [% END %]
+    </tr>
+
+    [% FOREACH part = PARTS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <td>
+      <input type="radio" name="selection" value="[% loop.count %]"[% IF loop.first %] checked[% END %]>
+     </td>
+
+     <td>
+      <input type="hidden" name="new_id_[% loop.count %]" value="[% HTML.escape(part.id) %]">
+      <input type="hidden" name="new_number_[% loop.count %]" value="[% HTML.escape(part.number) %]">
+      [% HTML.escape(part.number) %]
+     </td>
+
+     <td>
+      <input type="hidden" name="new_description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
+      [% HTML.escape(part.description) %]
+     </td>
+
+     [% IF has_charge %]
+     <td>
+      <input type="hidden" name="new_charge_id_[% loop.count %]" value="[% HTML.escape(part.charge_id) %]">
+      <input type="hidden" name="new_chargenumber_[% loop.count %]" value="[% HTML.escape(part.chargenumber) %]">
+      [% HTML.escape(part.chargenumber) %]
+     </td>
+     [% END %]
+     [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
+     <td>
+      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
+      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
+      [% HTML.escape(part.bestbefore) %]
+     </td>
+     [% END %]
+     [% END %]
+     [% IF has_ean %]
+     <td>
+      <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">
+      [% HTML.escape(part.ean) %]
+     [% END %]
+     </td>
+    </tr>
+    [% END %]
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/select_part_de.html b/templates/webpages/generic/select_part_de.html
deleted file mode 100644 (file)
index e49e806..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form method="post" action="[% HTML.escape(script) %]">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-  <input type="hidden" name="callback_sub" value="[% HTML.escape(callback_sub) %]">
-
-  <input type="hidden" name="old_form" value="[% HTML.escape(old_form) %]">
-  <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
-  <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
-
-  <div class="listtop">Artikel oder Erzeugnis ausw&auml;hlen</div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Nummer</th>
-     <th class="listheading">Beschreibung</th>
-     [% IF has_charge %]
-     <th class="listheading">Chargennummer</th>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <th class="listheading">EAN</th>
-     [% END %]
-    </tr>
-
-    [% FOREACH part = PARTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      <input type="radio" name="selection" value="[% loop.count %]"[% IF loop.first %] checked[% END %]>
-     </td>
-
-     <td>
-      <input type="hidden" name="new_id_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-      <input type="hidden" name="new_number_[% loop.count %]" value="[% HTML.escape(part.number) %]">
-      [% HTML.escape(part.number) %]
-     </td>
-
-     <td>
-      <input type="hidden" name="new_description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-      [% HTML.escape(part.description) %]
-     </td>
-
-     [% IF has_charge %]
-     <td>
-      <input type="hidden" name="new_charge_id_[% loop.count %]" value="[% HTML.escape(part.charge_id) %]">
-      <input type="hidden" name="new_chargenumber_[% loop.count %]" value="[% HTML.escape(part.chargenumber) %]">
-      [% HTML.escape(part.chargenumber) %]
-     </td>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <td>
-      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
-      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
-      [% HTML.escape(part.bestbefore) %]
-     </td>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <td>
-      <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">
-      [% HTML.escape(part.ean) %]
-     [% END %]
-     </td>
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_part_en.html b/templates/webpages/generic/select_part_en.html
deleted file mode 100644 (file)
index 01f6ae3..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form method="post" action="[% HTML.escape(script) %]">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-  <input type="hidden" name="callback_sub" value="[% HTML.escape(callback_sub) %]">
-
-  <input type="hidden" name="old_form" value="[% HTML.escape(old_form) %]">
-  <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
-  <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
-
-  <div class="listtop">Select a part or assembly</div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading">Number</th>
-     <th class="listheading">Description</th>
-     [% IF has_charge %]
-     <th class="listheading">Charge number</th>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <th class="listheading">Best Before</th>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <th class="listheading">EAN</th>
-     [% END %]
-    </tr>
-
-    [% FOREACH part = PARTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      <input type="radio" name="selection" value="[% loop.count %]"[% IF loop.first %] checked[% END %]>
-     </td>
-
-     <td>
-      <input type="hidden" name="new_id_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-      <input type="hidden" name="new_number_[% loop.count %]" value="[% HTML.escape(part.number) %]">
-      [% HTML.escape(part.number) %]
-     </td>
-
-     <td>
-      <input type="hidden" name="new_description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-      [% HTML.escape(part.description) %]
-     </td>
-
-     [% IF has_charge %]
-     <td>
-      <input type="hidden" name="new_charge_id_[% loop.count %]" value="[% HTML.escape(part.charge_id) %]">
-      <input type="hidden" name="new_chargenumber_[% loop.count %]" value="[% HTML.escape(part.chargenumber) %]">
-      [% HTML.escape(part.chargenumber) %]
-     </td>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <td>
-      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
-      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
-      [% HTML.escape(part.bestbefore) %]
-     </td>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <td>
-      <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">
-      [% HTML.escape(part.ean) %]
-     [% END %]
-     </td>
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_part_master.html b/templates/webpages/generic/select_part_master.html
deleted file mode 100644 (file)
index 433bceb..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-[% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
-
- <form method="post" action="[% HTML.escape(script) %]">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-  <input type="hidden" name="callback_sub" value="[% HTML.escape(callback_sub) %]">
-
-  <input type="hidden" name="old_form" value="[% HTML.escape(old_form) %]">
-  <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
-  <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
-
-  <div class="listtop"><translate>Select a part or assembly</translate></div>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Number</translate></th>
-     <th class="listheading"><translate>Description</translate></th>
-     [% IF has_charge %]
-     <th class="listheading"><translate>Charge number</translate></th>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <th class="listheading"><translate>EAN</translate></th>
-     [% END %]
-    </tr>
-
-    [% FOREACH part = PARTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td>
-      <input type="radio" name="selection" value="[% loop.count %]"[% IF loop.first %] checked[% END %]>
-     </td>
-
-     <td>
-      <input type="hidden" name="new_id_[% loop.count %]" value="[% HTML.escape(part.id) %]">
-      <input type="hidden" name="new_number_[% loop.count %]" value="[% HTML.escape(part.number) %]">
-      [% HTML.escape(part.number) %]
-     </td>
-
-     <td>
-      <input type="hidden" name="new_description_[% loop.count %]" value="[% HTML.escape(part.description) %]">
-      [% HTML.escape(part.description) %]
-     </td>
-
-     [% IF has_charge %]
-     <td>
-      <input type="hidden" name="new_charge_id_[% loop.count %]" value="[% HTML.escape(part.charge_id) %]">
-      <input type="hidden" name="new_chargenumber_[% loop.count %]" value="[% HTML.escape(part.chargenumber) %]">
-      [% HTML.escape(part.chargenumber) %]
-     </td>
-     [% END %]
-     [% IF has_bestbefore %]
-     [% IF conf_show_best_before %]
-     <td>
-      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
-      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
-      [% HTML.escape(part.bestbefore) %]
-     </td>
-     [% END %]
-     [% END %]
-     [% IF has_ean %]
-     <td>
-      <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">
-      [% HTML.escape(part.ean) %]
-     [% END %]
-     </td>
-    </tr>
-    [% END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_vendor.html b/templates/webpages/generic/select_vendor.html
new file mode 100644 (file)
index 0000000..35258df
--- /dev/null
@@ -0,0 +1,66 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <form name="Form">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+
+   <tr><td>[% 'Please select a vendor from the list below.' | $T8 %]</td></tr>
+
+   <tr>
+    <td>
+
+     <table>
+      <tr class="listheading">
+       <th class="listheading">&nbsp;</th>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
+      </tr>
+
+      [%- FOREACH row = VENDOR %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
+     </table>
+
+    </td>
+   </tr>
+  </table>
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function vendor_selected(selected) {
+        var name = document.getElementsByName("name_" + selected)[0].value
+        var id = document.getElementsByName("id_" + selected)[0].value
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
+        if (document.Form.input_id.value != "") {
+          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
+        }
+        self.close();
+      }
+      //-->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/select_vendor_de.html b/templates/webpages/generic/select_vendor_de.html
deleted file mode 100644 (file)
index 3fc4d31..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td>Bitte einen Händler aus der Liste auswählen</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = VENDOR %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function vendor_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_vendor_en.html b/templates/webpages/generic/select_vendor_en.html
deleted file mode 100644 (file)
index 040a6ea..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td>Please select a vendor from the list below.</td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = VENDOR %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function vendor_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/select_vendor_master.html b/templates/webpages/generic/select_vendor_master.html
deleted file mode 100644 (file)
index 51b30b6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-
-   <tr><td><translate>Please select a vendor from the list below.</translate></td></tr>
-
-   <tr>
-    <td>
-
-     <table>
-      <tr class="listheading">
-       <th class="listheading">&nbsp;</th>
-       [%- FOREACH col = HEADER %]
-       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
-       [%- END %]
-      </tr>
-
-      [%- FOREACH row = VENDOR %]
-      <tr class="listrow[% loop.count % 2 %]">
-       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
-       <td>
-        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-        [% HTML.escape(name) %]
-       </td>
-       <td>[% HTML.escape(row.customernumber) %]</td>
-       <td>[% HTML.escape(row.address) %]</td>
-<!--        <td> -->
-<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
-<!--         [% HTML.escape(row.description) %] -->
-<!--        </td> -->
-      </tr>
-      [%- END %]
-     </table>
-
-    </td>
-   </tr>
-  </table>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function vendor_selected(selected) {
-        var name = document.getElementsByName("name_" + selected)[0].value
-        var id = document.getElementsByName("id_" + selected)[0].value
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
-        if (document.Form.input_id.value != "") {
-          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
-        }
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/set_longdescription.html b/templates/webpages/generic/set_longdescription.html
new file mode 100644 (file)
index 0000000..72b50cd
--- /dev/null
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <form name="Form">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>[% 'Please insert your longdescription below' | $T8 %]</p>
+
+  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
+
+  <p><input type="submit" onclick="longdescription_updated()" value="[% 'Close' | $T8 %]"></p>
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function longdescription_updated() {
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = document.getElementsByName("longdescription")[0].value;
+
+        self.close();
+      }
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/generic/set_longdescription_de.html b/templates/webpages/generic/set_longdescription_de.html
deleted file mode 100644 (file)
index 318d31b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Bitte den Langtext eingeben</p>
-
-  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
-
-  <p><input type="submit" onclick="longdescription_updated()" value="Übernehmen"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      function longdescription_updated() {
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = document.getElementsByName("longdescription")[0].value;
-
-        self.close();
-      }
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/set_longdescription_en.html b/templates/webpages/generic/set_longdescription_en.html
deleted file mode 100644 (file)
index 8a61fa6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Please insert your longdescription below</p>
-
-  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
-
-  <p><input type="submit" onclick="longdescription_updated()" value="Close"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      function longdescription_updated() {
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = document.getElementsByName("longdescription")[0].value;
-
-        self.close();
-      }
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generic/set_longdescription_master.html b/templates/webpages/generic/set_longdescription_master.html
deleted file mode 100644 (file)
index 9e2e6ea..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p><translate>Please insert your longdescription below</translate></p>
-
-  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
-
-  <p><input type="submit" onclick="longdescription_updated()" value="<translate>Close</translate>"></p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      function longdescription_updated() {
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = document.getElementsByName("longdescription")[0].value;
-
-        self.close();
-      }
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/generictranslations/edit_greetings.html b/templates/webpages/generictranslations/edit_greetings.html
new file mode 100644 (file)
index 0000000..345886a
--- /dev/null
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <p>
+  <div class="listtop">[% HTML.escape(title) %]</div>
+ </p>
+
+ [%- IF message %]
+ <p>
+  [% HTML.escape(message) %]
+ </p>
+ [%- END %]
+
+ <form method="post" action="generictranslations.pl">
+
+  <table>
+
+   <tr>
+    <th class="listheading">&nbsp;</th>
+    <th class="listheading">[% 'male' | $T8 %]</th>
+    <th class="listheading">[% 'female' | $T8 %]</th>
+   </tr>
+
+   [%- FOREACH language = LANGUAGES %]
+   <tr>
+    <td>
+     [%- IF language.id == 'default' %]
+     [% 'Default (no language selected)' | $T8 %]
+     [%- ELSE %]
+     [%- HTML.escape(language.description) %]
+     [%- END %]
+    </td>
+    <td><input name="translation__[% language.id %]__male" size="40" value="[% HTML.escape(language.male) %]"></td>
+    <td><input name="translation__[% language.id %]__female" size="40" value="[% HTML.escape(language.female) %]"></td>
+   </tr>
+   [%- END %]
+
+  </table>
+
+  <p>
+   <input type="hidden" name="action" value="save_greetings">
+   <input type="submit" class="submit" value="[% 'Save' | $T8 %]">
+  </p>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/generictranslations/edit_greetings_de.html b/templates/webpages/generictranslations/edit_greetings_de.html
deleted file mode 100644 (file)
index b5f318e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]<body>
-
- <p>
-  <div class="listtop">[% HTML.escape(title) %]</div>
- </p>
-
- [%- IF message %]
- <p>
-  [% HTML.escape(message) %]
- </p>
- [%- END %]
-
- <form method="post" action="generictranslations.pl">
-
-  <table>
-
-   <tr>
-    <th class="listheading">&nbsp;</th>
-    <th class="listheading">männlich</th>
-    <th class="listheading">weiblich</th>
-   </tr>
-
-   [%- FOREACH language = LANGUAGES %]
-   <tr>
-    <td>
-     [%- IF language.id == 'default' %]
-     Standard (keine Sprache ausgewählt)
-     [%- ELSE %]
-     [%- HTML.escape(language.description) %]
-     [%- END %]
-    </td>
-    <td><input name="translation__[% language.id %]__male" size="40" value="[% HTML.escape(language.male) %]"></td>
-    <td><input name="translation__[% language.id %]__female" size="40" value="[% HTML.escape(language.female) %]"></td>
-   </tr>
-   [%- END %]
-
-  </table>
-
-  <p>
-   <input type="hidden" name="action" value="save_greetings">
-   <input type="submit" class="submit" value="Speichern">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generictranslations/edit_greetings_en.html b/templates/webpages/generictranslations/edit_greetings_en.html
deleted file mode 100644 (file)
index ad41cd0..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]<body>
-
- <p>
-  <div class="listtop">[% HTML.escape(title) %]</div>
- </p>
-
- [%- IF message %]
- <p>
-  [% HTML.escape(message) %]
- </p>
- [%- END %]
-
- <form method="post" action="generictranslations.pl">
-
-  <table>
-
-   <tr>
-    <th class="listheading">&nbsp;</th>
-    <th class="listheading">male</th>
-    <th class="listheading">female</th>
-   </tr>
-
-   [%- FOREACH language = LANGUAGES %]
-   <tr>
-    <td>
-     [%- IF language.id == 'default' %]
-     Default (no language selected)
-     [%- ELSE %]
-     [%- HTML.escape(language.description) %]
-     [%- END %]
-    </td>
-    <td><input name="translation__[% language.id %]__male" size="40" value="[% HTML.escape(language.male) %]"></td>
-    <td><input name="translation__[% language.id %]__female" size="40" value="[% HTML.escape(language.female) %]"></td>
-   </tr>
-   [%- END %]
-
-  </table>
-
-  <p>
-   <input type="hidden" name="action" value="save_greetings">
-   <input type="submit" class="submit" value="Save">
-  </p>
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/generictranslations/edit_greetings_master.html b/templates/webpages/generictranslations/edit_greetings_master.html
deleted file mode 100644 (file)
index 897ea64..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[% USE HTML %]<body>
-
- <p>
-  <div class="listtop">[% HTML.escape(title) %]</div>
- </p>
-
- [%- IF message %]
- <p>
-  [% HTML.escape(message) %]
- </p>
- [%- END %]
-
- <form method="post" action="generictranslations.pl">
-
-  <table>
-
-   <tr>
-    <th class="listheading">&nbsp;</th>
-    <th class="listheading"><translate>male</translate></th>
-    <th class="listheading"><translate>female</translate></th>
-   </tr>
-
-   [%- FOREACH language = LANGUAGES %]
-   <tr>
-    <td>
-     [%- IF language.id == 'default' %]
-     <translate>Default (no language selected)</translate>
-     [%- ELSE %]
-     [%- HTML.escape(language.description) %]
-     [%- END %]
-    </td>
-    <td><input name="translation__[% language.id %]__male" size="40" value="[% HTML.escape(language.male) %]"></td>
-    <td><input name="translation__[% language.id %]__female" size="40" value="[% HTML.escape(language.female) %]"></td>
-   </tr>
-   [%- END %]
-
-  </table>
-
-  <p>
-   <input type="hidden" name="action" value="save_greetings">
-   <input type="submit" class="submit" value="<translate>Save</translate>">
-  </p>
-
- </form>
-
-</body>
-</html>
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 (file)
index 0000000..3263ee7
--- /dev/null
@@ -0,0 +1,28 @@
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE LxERP %]
+
+<script type="text/javascript">
+ <!--
+var chart_balances = new Array();
+
+[% FOREACH chart = ALL_CHARTS %]
+chart_balances[[% loop.count - 1 %]] = '[% JavaScript.escape(LxERP.format_amount(chart.balance, 2, 0, 'DRCR')) %]';
+[%- END %]
+
+function show_chart_balance(obj) {
+  var row = $(obj).attr('name').replace(/.*_/, '');
+  var idx = $('#accno_' + row).attr('selectedIndex');
+  $('#chart_balance_' + row).html(chart_balances[idx]);
+}
+
+$(document).ready(function() {
+  [%- SET row=0 %]
+  [%- WHILE row < rowcount %]
+   [%- SET row=row + 1 %]
+   $('#accno_[% row %]').change(function() { show_chart_balance(this); });
+   show_chart_balance($('#accno_[% row %]'));
+  [%- END %]
+});
+-->
+</script>
diff --git a/templates/webpages/gl/form_header_chart_balances_js_de.html b/templates/webpages/gl/form_header_chart_balances_js_de.html
deleted file mode 100644 (file)
index 3263ee7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-[% USE JavaScript %]
-[% USE LxERP %]
-
-<script type="text/javascript">
- <!--
-var chart_balances = new Array();
-
-[% FOREACH chart = ALL_CHARTS %]
-chart_balances[[% loop.count - 1 %]] = '[% JavaScript.escape(LxERP.format_amount(chart.balance, 2, 0, 'DRCR')) %]';
-[%- END %]
-
-function show_chart_balance(obj) {
-  var row = $(obj).attr('name').replace(/.*_/, '');
-  var idx = $('#accno_' + row).attr('selectedIndex');
-  $('#chart_balance_' + row).html(chart_balances[idx]);
-}
-
-$(document).ready(function() {
-  [%- SET row=0 %]
-  [%- WHILE row < rowcount %]
-   [%- SET row=row + 1 %]
-   $('#accno_[% row %]').change(function() { show_chart_balance(this); });
-   show_chart_balance($('#accno_[% row %]'));
-  [%- END %]
-});
--->
-</script>
diff --git a/templates/webpages/gl/form_header_chart_balances_js_en.html b/templates/webpages/gl/form_header_chart_balances_js_en.html
deleted file mode 100644 (file)
index 3263ee7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-[% USE JavaScript %]
-[% USE LxERP %]
-
-<script type="text/javascript">
- <!--
-var chart_balances = new Array();
-
-[% FOREACH chart = ALL_CHARTS %]
-chart_balances[[% loop.count - 1 %]] = '[% JavaScript.escape(LxERP.format_amount(chart.balance, 2, 0, 'DRCR')) %]';
-[%- END %]
-
-function show_chart_balance(obj) {
-  var row = $(obj).attr('name').replace(/.*_/, '');
-  var idx = $('#accno_' + row).attr('selectedIndex');
-  $('#chart_balance_' + row).html(chart_balances[idx]);
-}
-
-$(document).ready(function() {
-  [%- SET row=0 %]
-  [%- WHILE row < rowcount %]
-   [%- SET row=row + 1 %]
-   $('#accno_[% row %]').change(function() { show_chart_balance(this); });
-   show_chart_balance($('#accno_[% row %]'));
-  [%- END %]
-});
--->
-</script>
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 (file)
index 3263ee7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-[% USE JavaScript %]
-[% USE LxERP %]
-
-<script type="text/javascript">
- <!--
-var chart_balances = new Array();
-
-[% FOREACH chart = ALL_CHARTS %]
-chart_balances[[% loop.count - 1 %]] = '[% JavaScript.escape(LxERP.format_amount(chart.balance, 2, 0, 'DRCR')) %]';
-[%- END %]
-
-function show_chart_balance(obj) {
-  var row = $(obj).attr('name').replace(/.*_/, '');
-  var idx = $('#accno_' + row).attr('selectedIndex');
-  $('#chart_balance_' + row).html(chart_balances[idx]);
-}
-
-$(document).ready(function() {
-  [%- SET row=0 %]
-  [%- WHILE row < rowcount %]
-   [%- SET row=row + 1 %]
-   $('#accno_[% row %]').change(function() { show_chart_balance(this); });
-   show_chart_balance($('#accno_[% row %]'));
-  [%- END %]
-});
--->
-</script>
diff --git a/templates/webpages/gl/generate_report_bottom.html b/templates/webpages/gl/generate_report_bottom.html
new file mode 100644 (file)
index 0000000..eb093a0
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]<form method="post" action="gl.pl">
+
+ <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+
+ <input class="submit" type="submit" name="action" value="[% 'GL Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
+
+</form>
diff --git a/templates/webpages/gl/generate_report_bottom_de.html b/templates/webpages/gl/generate_report_bottom_de.html
deleted file mode 100644 (file)
index 3798ab0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<form method="post" action="gl.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input class="submit" type="submit" name="action" value="Dialogbuchung">
- <input class="submit" type="submit" name="action" value="Debitorenbuchung">
- <input class="submit" type="submit" name="action" value="Kreditorenbuchung">
- <input class="submit" type="submit" name="action" value="Rechnung">
- <input class="submit" type="submit" name="action" value="Einkaufsrechnung">
-
-</form>
diff --git a/templates/webpages/gl/generate_report_bottom_en.html b/templates/webpages/gl/generate_report_bottom_en.html
deleted file mode 100644 (file)
index 197f6f5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<form method="post" action="gl.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input class="submit" type="submit" name="action" value="GL Transaction">
- <input class="submit" type="submit" name="action" value="Sales Transaction">
- <input class="submit" type="submit" name="action" value="Purchase Transaction">
- <input class="submit" type="submit" name="action" value="Sales Invoice">
- <input class="submit" type="submit" name="action" value="Vendor Invoice">
-
-</form>
diff --git a/templates/webpages/gl/generate_report_bottom_master.html b/templates/webpages/gl/generate_report_bottom_master.html
deleted file mode 100644 (file)
index a5c41ff..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]<form method="post" action="gl.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input class="submit" type="submit" name="action" value="<translate>GL Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>AR Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>AP Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Sales Invoice</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Vendor Invoice</translate>">
-
-</form>
diff --git a/templates/webpages/ic/ajax_autocomplete.html b/templates/webpages/ic/ajax_autocomplete.html
new file mode 100644 (file)
index 0000000..5bbd3b6
--- /dev/null
@@ -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_de.html b/templates/webpages/ic/ajax_autocomplete_de.html
deleted file mode 100644 (file)
index 5bbd3b6..0000000
+++ /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/ajax_autocomplete_en.html b/templates/webpages/ic/ajax_autocomplete_en.html
deleted file mode 100644 (file)
index 5bbd3b6..0000000
+++ /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/ajax_autocomplete_master.html b/templates/webpages/ic/ajax_autocomplete_master.html
deleted file mode 100644 (file)
index 5bbd3b6..0000000
+++ /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 (file)
index 0000000..c7f8d83
--- /dev/null
@@ -0,0 +1,35 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+  <tr class=listheading>
+   <th class=listheading>[% 'Individual Items' | $T8 %]</th>
+  </tr>
+  <tr>
+   <td>
+    <table width=100%>
+     <tr>
+[%- FOREACH col = COLUMNS %]
+[%- SET hcol = HEADER.$col %]
+      <th[% ' nowrap' IF hcol.nowrap %][% ' width=' _ hcol.width IF hcol.width %][% ' align=' _ hcol.align IF hcol.align %]>[% hcol.text %]</th>
+[%- END %]
+     </tr>
+[%- FOREACH row = ROWS %]
+     <tr>
+ [%- FOREACH col = COLUMNS %]
+  [%- SET rcol = row.$col %]
+      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- rcol.data %]</td>
+ [%- END %]
+ [%- FOREACH hidden = row.hiddens %]
+      <input type=hidden name="[% hidden.name %]" value="[% hidden.value %]">
+ [%- END %]
+     </tr>
+[%- END %]
+     <tr>
+      <td colspan="6"></td>
+      <td>[% 'Totals' | $T8 %]</td>
+      <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
+      <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
+     </tr>
+     <input type="hidden" name="assembly_rows" value="[% assembly_rows %]">
+    </table>
+   </td>
+  </tr>
diff --git a/templates/webpages/ic/assembly_row_de.html b/templates/webpages/ic/assembly_row_de.html
deleted file mode 100644 (file)
index 56bac71..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- USE LxERP %]
-  <tr class=listheading>
-   <th class=listheading>Einzelteile</th>
-  </tr>
-  <tr>
-   <td>
-    <table width=100%>
-     <tr>
-[%- FOREACH col = COLUMNS %]
-[%- SET hcol = HEADER.$col %]
-      <th[% ' nowrap' IF hcol.nowrap %][% ' width=' _ hcol.width IF hcol.width %][% ' align=' _ hcol.align IF hcol.align %]>[% hcol.text %]</th>
-[%- END %]
-     </tr>
-[%- FOREACH row = ROWS %]
-     <tr>
- [%- FOREACH col = COLUMNS %]
-  [%- SET rcol = row.$col %]
-      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- rcol.data %]</td>
- [%- END %]
- [%- FOREACH hidden = row.hiddens %]
-      <input type=hidden name="[% hidden.name %]" value="[% hidden.value %]">
- [%- END %]
-     </tr>
-[%- END %]
-     <tr>
-      <td colspan="6"></td>
-      <td>Summen</td>
-      <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
-      <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
-     </tr>
-     <input type="hidden" name="assembly_rows" value="[% assembly_rows %]">
-    </table>
-   </td>
-  </tr>
diff --git a/templates/webpages/ic/assembly_row_en.html b/templates/webpages/ic/assembly_row_en.html
deleted file mode 100644 (file)
index b45deb0..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- USE LxERP %]
-  <tr class=listheading>
-   <th class=listheading>Individual Items</th>
-  </tr>
-  <tr>
-   <td>
-    <table width=100%>
-     <tr>
-[%- FOREACH col = COLUMNS %]
-[%- SET hcol = HEADER.$col %]
-      <th[% ' nowrap' IF hcol.nowrap %][% ' width=' _ hcol.width IF hcol.width %][% ' align=' _ hcol.align IF hcol.align %]>[% hcol.text %]</th>
-[%- END %]
-     </tr>
-[%- FOREACH row = ROWS %]
-     <tr>
- [%- FOREACH col = COLUMNS %]
-  [%- SET rcol = row.$col %]
-      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- rcol.data %]</td>
- [%- END %]
- [%- FOREACH hidden = row.hiddens %]
-      <input type=hidden name="[% hidden.name %]" value="[% hidden.value %]">
- [%- END %]
-     </tr>
-[%- END %]
-     <tr>
-      <td colspan="6"></td>
-      <td>Totals</td>
-      <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
-      <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
-     </tr>
-     <input type="hidden" name="assembly_rows" value="[% assembly_rows %]">
-    </table>
-   </td>
-  </tr>
diff --git a/templates/webpages/ic/assembly_row_master.html b/templates/webpages/ic/assembly_row_master.html
deleted file mode 100644 (file)
index c95fe07..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- USE LxERP %]
-  <tr class=listheading>
-   <th class=listheading><translate>Individual Items</translate></th>
-  </tr>
-  <tr>
-   <td>
-    <table width=100%>
-     <tr>
-[%- FOREACH col = COLUMNS %]
-[%- SET hcol = HEADER.$col %]
-      <th[% ' nowrap' IF hcol.nowrap %][% ' width=' _ hcol.width IF hcol.width %][% ' align=' _ hcol.align IF hcol.align %]>[% hcol.text %]</th>
-[%- END %]
-     </tr>
-[%- FOREACH row = ROWS %]
-     <tr>
- [%- FOREACH col = COLUMNS %]
-  [%- SET rcol = row.$col %]
-      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- rcol.data %]</td>
- [%- END %]
- [%- FOREACH hidden = row.hiddens %]
-      <input type=hidden name="[% hidden.name %]" value="[% hidden.value %]">
- [%- END %]
-     </tr>
-[%- END %]
-     <tr>
-      <td colspan="6"></td>
-      <td><translate>Totals</translate></td>
-      <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
-      <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
-     </tr>
-     <input type="hidden" name="assembly_rows" value="[% assembly_rows %]">
-    </table>
-   </td>
-  </tr>
diff --git a/templates/webpages/ic/choice.html b/templates/webpages/ic/choice.html
new file mode 100644 (file)
index 0000000..eb62525
--- /dev/null
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body>
+
+ <form method="post" action="ic.pl">
+
+  [%- FOREACH row = HIDDENS %]
+  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
+  [%- END %]
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th class="listheading" nowrap>[% 'Part Number' | $T8 %]</th>
+     <th class="listheading" nowrap>[% 'Part Description' | $T8 %]</th>
+    </tr>
+    <tr valign="top">
+     <td><input type="text" name="partnumber" size="20"></td>
+     <td><input type="text" name="description" size="30"></td>
+    </tr>
+   </table>
+  </p>
+
+  [%- FOREACH row = PARTS %]
+  <input type="hidden" name="totop100_partnumber_[% loop.count %]" value="[% row.totop100_partnumber %]">
+  <input type="hidden" name="totop100_description_[% loop.count %]" value="[% row.totop100_description %]">
+  <input type="hidden" name="totop100_unit_[% loop.count %]" value="[% row.totop100_unit %]">
+  <input type="hidden" name="totop100_sellprice_[% loop.count %]" value="[% row.totop100_sellprice %]">
+  <input type="hidden" name="totop100_soldtotal_[% loop.count %]" value="[% row.totop100_soldtotal %]">
+  [%- END %]
+
+  <p>
+   <input class="submit" type="submit" name="action" value="[% 'list' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ic/choice_de.html b/templates/webpages/ic/choice_de.html
deleted file mode 100644 (file)
index ecb4657..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading" nowrap>Artikelnummer</th>
-     <th class="listheading" nowrap>Artikelbeschreibung</th>
-    </tr>
-    <tr valign="top">
-     <td><input type="text" name="partnumber" size="20"></td>
-     <td><input type="text" name="description" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  [%- FOREACH row = PARTS %]
-  <input type="hidden" name="totop100_partnumber_[% loop.count %]" value="[% row.totop100_partnumber %]">
-  <input type="hidden" name="totop100_description_[% loop.count %]" value="[% row.totop100_description %]">
-  <input type="hidden" name="totop100_unit_[% loop.count %]" value="[% row.totop100_unit %]">
-  <input type="hidden" name="totop100_sellprice_[% loop.count %]" value="[% row.totop100_sellprice %]">
-  <input type="hidden" name="totop100_soldtotal_[% loop.count %]" value="[% row.totop100_soldtotal %]">
-  [%- END %]
-
-  <p>
-   <input class="submit" type="submit" name="action" value="auflisten">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/choice_en.html b/templates/webpages/ic/choice_en.html
deleted file mode 100644 (file)
index e667bf2..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading" nowrap>Part Number</th>
-     <th class="listheading" nowrap>Part Description</th>
-    </tr>
-    <tr valign="top">
-     <td><input type="text" name="partnumber" size="20"></td>
-     <td><input type="text" name="description" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  [%- FOREACH row = PARTS %]
-  <input type="hidden" name="totop100_partnumber_[% loop.count %]" value="[% row.totop100_partnumber %]">
-  <input type="hidden" name="totop100_description_[% loop.count %]" value="[% row.totop100_description %]">
-  <input type="hidden" name="totop100_unit_[% loop.count %]" value="[% row.totop100_unit %]">
-  <input type="hidden" name="totop100_sellprice_[% loop.count %]" value="[% row.totop100_sellprice %]">
-  <input type="hidden" name="totop100_soldtotal_[% loop.count %]" value="[% row.totop100_soldtotal %]">
-  [%- END %]
-
-  <p>
-   <input class="submit" type="submit" name="action" value="list">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/choice_master.html b/templates/webpages/ic/choice_master.html
deleted file mode 100644 (file)
index 434d697..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading" nowrap><translate>Part Number</translate></th>
-     <th class="listheading" nowrap><translate>Part Description</translate></th>
-    </tr>
-    <tr valign="top">
-     <td><input type="text" name="partnumber" size="20"></td>
-     <td><input type="text" name="description" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  [%- FOREACH row = PARTS %]
-  <input type="hidden" name="totop100_partnumber_[% loop.count %]" value="[% row.totop100_partnumber %]">
-  <input type="hidden" name="totop100_description_[% loop.count %]" value="[% row.totop100_description %]">
-  <input type="hidden" name="totop100_unit_[% loop.count %]" value="[% row.totop100_unit %]">
-  <input type="hidden" name="totop100_sellprice_[% loop.count %]" value="[% row.totop100_sellprice %]">
-  <input type="hidden" name="totop100_soldtotal_[% loop.count %]" value="[% row.totop100_soldtotal %]">
-  [%- END %]
-
-  <p>
-   <input class="submit" type="submit" name="action" value="<translate>list</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/confirm_price_update.html b/templates/webpages/ic/confirm_price_update.html
new file mode 100644 (file)
index 0000000..cc28548
--- /dev/null
@@ -0,0 +1,26 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body>
+
+ <form method="post" action="ic.pl">
+
+  [%- FOREACH row = HIDDENS %]
+  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
+  [%- END %]
+
+  <h2 class="confirm">[% 'Confirm!' | $T8 %]</h2>
+
+  <p>
+   [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]
+  </p>
+
+  <p>[% 'Are you sure you want to update the prices' | $T8 %]?</p>
+
+  <p>
+   <input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/ic/confirm_price_update_de.html b/templates/webpages/ic/confirm_price_update_de.html
deleted file mode 100644 (file)
index 106cf4f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <h2 class="confirm">Bestätigen Sie!</h2>
-
-  <p>
-   [% LxERP.format_string('Ungefähr #1 Preise werden aktualisiert.', num_matches) %]
-  </p>
-
-  <p>Sind Sie sicher, dass Sie die Preise aktualisieren wollen??</p>
-
-  <p>
-   <input name="action" class="submit" type="submit" value="Weiter">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
-  </p>
- </form>
-</body>
-</html>
diff --git a/templates/webpages/ic/confirm_price_update_en.html b/templates/webpages/ic/confirm_price_update_en.html
deleted file mode 100644 (file)
index 9e9e405..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <h2 class="confirm">Confirm!</h2>
-
-  <p>
-   [% LxERP.format_string('Approximately #1 prices will be updated.', num_matches) %]
-  </p>
-
-  <p>Are you sure you want to update the prices?</p>
-
-  <p>
-   <input name="action" class="submit" type="submit" value="Continue">
-   <input type="button" class="submit" onclick="history.back()" value="Back">
-  </p>
- </form>
-</body>
-</html>
diff --git a/templates/webpages/ic/confirm_price_update_master.html b/templates/webpages/ic/confirm_price_update_master.html
deleted file mode 100644 (file)
index 03f814d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
-  [%- END %]
-
-  <h2 class="confirm"><translate>Confirm!</translate></h2>
-
-  <p>
-   [% LxERP.format_string('<translate>Approximately #1 prices will be updated.</translate>', num_matches) %]
-  </p>
-
-  <p><translate>Are you sure you want to update the prices</translate>?</p>
-
-  <p>
-   <input name="action" class="submit" type="submit" value="<translate>Continue</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
-  </p>
- </form>
-</body>
-</html>
diff --git a/templates/webpages/ic/form_footer.html b/templates/webpages/ic/form_footer.html
new file mode 100644 (file)
index 0000000..b916011
--- /dev/null
@@ -0,0 +1,93 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  [%- IF item == 'assembly' %]
+  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
+  <!-- tr>
+    <td>
+      <table border="0" width="100%">
+        <tr>
+          <th colspan="2" align=right>[% 'Total' | $T8 %]&nbsp;</th>
+          <th align=right>[% 'Purchase Price' | $T8 %]:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  [% 'Sell Price' | $T8 %]: [% LxERP.format_amount(assemblytotal, 2) %]</th>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
+  [%- END %]
+
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+  <input type="hidden" name="previousform" value="[% HTML.escape(previousform) %]">
+  <input type="hidden" name="taxaccount2" value="[% HTML.escape(taxaccount2) %]">
+  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+ </table>
+
+ <br style="clear: left" />
+</div>
+
+[%- IF CUSTOM_VARIABLES.size %]
+<div id="custom_variables" class="tabcontent">
+
+ <p>[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</p>
+
+ <p>
+  <table>
+   [%- FOREACH var = CUSTOM_VARIABLES %]
+   <tr>
+    <td align="right" valign="top">[% var.VALID_BOX %]</td>
+    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
+    <td valign="top">[% var.HTML_CODE %]</td>
+   </tr>
+   [%- END %]
+  </table>
+ </p>
+
+ <br style="clear: left" />
+</div>
+[%- END %]
+
+</div>
+
+<input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
+<input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
+
+  [%- IF id %]
+    [%- UNLESS previousform %]
+<input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
+    [%- END %]
+
+    [%- IF orphaned %]
+      [%- UNLESS previousform %]
+        [%- IF item == 'assembly' %]
+          [%- UNLESS onhand %]
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+          [%- END %]
+        [%- ELSE %]
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+        [%- END %]
+      [%- END %]
+    [%- END %]
+  [%- END %]
+
+  [%- IF id != "" %]
+<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+  [%- END %]
+
+</form>
+
+<script type="text/javascript" src="js/wz_tooltip.js"></script>
+<script type="text/javascript">
+<!--
+    var maintab = new ddtabcontent("maintab");
+    maintab.setpersist(true);
+    maintab.setselectedClassTarget("link"); //"link" or "linkparent"
+    maintab.init();
+  -->
+</script>
+
+</body>
+</html>
diff --git a/templates/webpages/ic/form_footer_de.html b/templates/webpages/ic/form_footer_de.html
deleted file mode 100644 (file)
index 755902e..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  [%- IF item == 'assembly' %]
-  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
-  <!-- tr>
-    <td>
-      <table border="0" width="100%">
-        <tr>
-          <th colspan="2" align=right>Summe&nbsp;</th>
-          <th align=right>Einkaufspreis:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  Verkaufspreis: [% LxERP.format_amount(assemblytotal, 2) %]</th>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
-  [%- END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="previousform" value="[% HTML.escape(previousform) %]">
-  <input type="hidden" name="taxaccount2" value="[% HTML.escape(taxaccount2) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
- </table>
-
- <br style="clear: left" />
-</div>
-
-[%- IF CUSTOM_VARIABLES.size %]
-<div id="custom_variables" class="tabcontent">
-
- <p>Unmarkierte Variablen werden für diesen Artikel nicht in Aufträgen und Rechnungen angezeigt.</p>
-
- <p>
-  <table>
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   <tr>
-    <td align="right" valign="top">[% var.VALID_BOX %]</td>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">[% var.HTML_CODE %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <br style="clear: left" />
-</div>
-[%- END %]
-
-</div>
-
-<input class="submit" type="submit" name="action" value="Erneuern">
-<input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-<input class="submit" type="submit" name="action" value="Speichern">
-
-  [%- IF id %]
-    [%- UNLESS previousform %]
-<input class="submit" type="submit" name="action" value="als neu speichern">
-    [%- END %]
-
-    [%- IF orphaned %]
-      [%- UNLESS previousform %]
-        [%- IF item == 'assembly' %]
-          [%- UNLESS onhand %]
-<input class="submit" type="submit" name="action" value="Löschen">
-          [%- END %]
-        [%- ELSE %]
-<input class="submit" type="submit" name="action" value="Löschen">
-        [%- END %]
-      [%- END %]
-    [%- END %]
-  [%- END %]
-
-  [%- IF id != "" %]
-<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
-  [%- END %]
-
-</form>
-
-<script type="text/javascript" src="js/wz_tooltip.js"></script>
-<script type="text/javascript">
-<!--
-    var maintab = new ddtabcontent("maintab");
-    maintab.setpersist(true);
-    maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-    maintab.init();
-  -->
-</script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/form_footer_en.html b/templates/webpages/ic/form_footer_en.html
deleted file mode 100644 (file)
index cf9f621..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  [%- IF item == 'assembly' %]
-  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
-  <!-- tr>
-    <td>
-      <table border="0" width="100%">
-        <tr>
-          <th colspan="2" align=right>Total&nbsp;</th>
-          <th align=right>Purchase Price:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  Sell Price: [% LxERP.format_amount(assemblytotal, 2) %]</th>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
-  [%- END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="previousform" value="[% HTML.escape(previousform) %]">
-  <input type="hidden" name="taxaccount2" value="[% HTML.escape(taxaccount2) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
- </table>
-
- <br style="clear: left" />
-</div>
-
-[%- IF CUSTOM_VARIABLES.size %]
-<div id="custom_variables" class="tabcontent">
-
- <p>Unchecked custom variables will not appear in orders and invoices.</p>
-
- <p>
-  <table>
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   <tr>
-    <td align="right" valign="top">[% var.VALID_BOX %]</td>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">[% var.HTML_CODE %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <br style="clear: left" />
-</div>
-[%- END %]
-
-</div>
-
-<input class="submit" type="submit" name="action" value="Update">
-<input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-<input class="submit" type="submit" name="action" value="Save">
-
-  [%- IF id %]
-    [%- UNLESS previousform %]
-<input class="submit" type="submit" name="action" value="Save as new">
-    [%- END %]
-
-    [%- IF orphaned %]
-      [%- UNLESS previousform %]
-        [%- IF item == 'assembly' %]
-          [%- UNLESS onhand %]
-<input class="submit" type="submit" name="action" value="Delete">
-          [%- END %]
-        [%- ELSE %]
-<input class="submit" type="submit" name="action" value="Delete">
-        [%- END %]
-      [%- END %]
-    [%- END %]
-  [%- END %]
-
-  [%- IF id != "" %]
-<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="history">
-  [%- END %]
-
-</form>
-
-<script type="text/javascript" src="js/wz_tooltip.js"></script>
-<script type="text/javascript">
-<!--
-    var maintab = new ddtabcontent("maintab");
-    maintab.setpersist(true);
-    maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-    maintab.init();
-  -->
-</script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
deleted file mode 100644 (file)
index ed08335..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  [%- IF item == 'assembly' %]
-  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
-  <!-- tr>
-    <td>
-      <table border="0" width="100%">
-        <tr>
-          <th colspan="2" align=right><translate>Total</translate>&nbsp;</th>
-          <th align=right><translate>Purchase Price</translate>:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  <translate>Sell Price</translate>: [% LxERP.format_amount(assemblytotal, 2) %]</th>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
-  [%- END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-  <input type="hidden" name="previousform" value="[% HTML.escape(previousform) %]">
-  <input type="hidden" name="taxaccount2" value="[% HTML.escape(taxaccount2) %]">
-  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
- </table>
-
- <br style="clear: left" />
-</div>
-
-[%- IF CUSTOM_VARIABLES.size %]
-<div id="custom_variables" class="tabcontent">
-
- <p><translate>Unchecked custom variables will not appear in orders and invoices.</translate></p>
-
- <p>
-  <table>
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   <tr>
-    <td align="right" valign="top">[% var.VALID_BOX %]</td>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">[% var.HTML_CODE %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
-
- <br style="clear: left" />
-</div>
-[%- END %]
-
-</div>
-
-<input class="submit" type="submit" name="action" value="<translate>Update</translate>">
-<input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
-
-  [%- IF id %]
-    [%- UNLESS previousform %]
-<input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-    [%- END %]
-
-    [%- IF orphaned %]
-      [%- UNLESS previousform %]
-        [%- IF item == 'assembly' %]
-          [%- UNLESS onhand %]
-<input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-          [%- END %]
-        [%- ELSE %]
-<input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-        [%- END %]
-      [%- END %]
-    [%- END %]
-  [%- END %]
-
-  [%- IF id != "" %]
-<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
-  [%- END %]
-
-</form>
-
-<script type="text/javascript" src="js/wz_tooltip.js"></script>
-<script type="text/javascript">
-<!--
-    var maintab = new ddtabcontent("maintab");
-    maintab.setpersist(true);
-    maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-    maintab.init();
-  -->
-</script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
new file mode 100644 (file)
index 0000000..1063fa5
--- /dev/null
@@ -0,0 +1,293 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body onLoad="fokus()">
+
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/parts_language_selection.js"></script>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form method="post" name="ic" action="[% script %]">
+
+  <input name="id" type="hidden" value="[% HTML.escape(id) %]">
+  <input name="item" type="hidden" value="[% HTML.escape(item) %]">
+  <input name="title" type="hidden" value="[% HTML.escape(title) %]">
+  <input name="makemodel" type="hidden" value="[% HTML.escape(makemodel) %]">
+  <input name="alternate" type="hidden" value="[% HTML.escape(alternate) %]">
+  <input name="onhand" type="hidden" value="[% HTML.escape(onhand) %]">
+  <input name="orphaned" type="hidden" value="[% HTML.escape(orphaned) %]">
+  <input name="taxaccounts" type="hidden" value="[% HTML.escape(taxaccounts) %]">
+  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
+  <input name="eur" type="hidden" value="[% HTML.escape(eur) %]">
+  <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
+  <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="master_data">[% 'Master Data' | $T8 %]</a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+  <div id="master_data" class="tabcontent">
+
+   <table width="100%">
+    <tr>
+     <td>
+      <table width="100%">
+       <tr valign="top">
+        <td>
+         <table>
+          <tr>
+           <td colspan="2">
+            <table>
+             <tr>
+              <th align="right">[% 'Part Number' | $T8 %]</th>
+              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
+             </tr>
+             <tr>
+              <th align="right">[% 'Part Description' | $T8 %]</th>
+              <td>
+               [%- IF description_area %]
+               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
+               [%- ELSE %]
+               <input name="description" size="40" value="[% HTML.escape(description) %]">
+               [%- END %]
+              </td>
+             </tr>
+             <tr>
+               <th align="right">[% 'EAN-Code' | $T8 %]</th>
+               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
+             </tr>
+             <tr>
+              [%- IF all_partsgroup.size %]
+              <th align="right">[% 'Group' | $T8 %]</th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'partsgroup',
+                     DATA       = all_partsgroup,
+                     show_empty = 1,
+                     id_sub     = 'pg_keys',
+                     label_key  = 'partsgroup',
+                     style      = 'width:250px'
+               -%]
+              </td>
+              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
+              [% END %]
+             </tr>
+
+
+             [%- IF BUCHUNGSGRUPPEN.size %]
+             <tr>
+              <th align="right">[% 'Buchungsgruppe' | $T8 %]</th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'buchungsgruppen_id',
+                     DATA       = BUCHUNGSGRUPPEN,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+             </tr>
+             [%- END %]
+             <input type="hidden" name="IC_income" value="[% HTML.escape(IC_income_default) %]">
+             [%- UNLESS is_assembly %]
+             <input type="hidden" name="IC_expense" value="[% HTML.escape(IC_expense_default) %]">
+             [%- END %]
+             [%- IF is_part %]
+             <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
+             [%- END %]
+             <tr>
+              <th align="right">[% 'Payment Terms' | $T8 %]</th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'payment_id',
+                     DATA       = payment_terms,
+                     show_empty = 1,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+              </td>
+             </tr>
+            </table>
+           </td>
+          </tr>
+
+          <tr>
+           <td>
+            <button type="button" onclick="parts_language_selection_window('language_values')">[% 'Set Language Values' | $T8 %]</button>
+           </td>
+          </tr>
+
+          <tr height="5"></tr>
+
+          <tr>
+           <td>
+            <table>
+             <tr>
+              <th align="left">[% 'Notes' | $T8 %]</th>
+              [%- UNLESS is_service %]
+              <th align="left">[% 'Formula' | $T8 %]</th>
+              [%- END %]
+             </tr>
+             <tr>
+              <td>
+               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
+              </td>
+              [%- UNLESS is_service %]
+              <td>
+               <ilayer>
+                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]')">
+                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+               </td>
+              [%- END %]
+             </tr>
+            </table>
+           </td>
+          </tr>
+         </table>
+        </td>
+
+        <td>
+         <table>
+          <tr>
+           <th align="right" nowrap="true">[% 'Updated' | $T8 %]</th>
+           <td>
+            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
+           </td>
+          </tr>
+
+          <tr>
+           <th align="right" nowrap="true">[% 'List Price' | $T8 %]</th>
+           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
+          </tr>
+
+          <tr>
+           <th align="right" nowrap="true">[% 'Sell Price' | $T8 %]</th>
+           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
+          </tr>
+
+          [%- UNLESS is_assembly %]
+          <tr>
+           <th align="right" nowrap="true">[% 'Last Cost' | $T8 %]</th>
+           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
+          </tr>
+          [%- END %]
+
+          [%- IF ALL_PRICE_FACTORS.size %]
+          <tr>
+           <th align="right">[% 'Price Factor' | $T8 %]</th>
+           <td>
+            [%- INCLUDE generic/multibox.html
+                  name       = 'price_factor_id',
+                  DATA       = ALL_PRICE_FACTORS,
+                  show_empty = 1,
+                  id_key     = 'id',
+                  label_key  = 'description',
+                  style      = 'width:100px'
+            -%]
+           </td>
+          </tr>
+          [%- END %]
+
+          <tr>
+           <th align="right" nowrap="true">[% 'Unit' | $T8 %]</th>
+           <td>
+            <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
+            [%- UNLESS unit_changeable %]
+            <input type="hidden" name="unit" value="[% HTML.escape(unit) %]">[% HTML.escape(unit) %]
+            [%- ELSE %]
+            [%- INCLUDE generic/multibox.html
+                  name       = 'unit',
+                  DATA       = ALL_UNITS,
+                  id_key     = 'name',
+                  label_key  = 'name',
+                  style      = 'width:100px'
+            -%]
+            [%- END %]
+           </td>
+          </tr>
+
+        [%- UNLESS is_service %]
+          <tr>
+           <th align="right" nowrap="true">[% 'Weight' | $T8 %]</th>
+           <td>
+            [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
+            <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
+            [% HTML.escape(defaults.weightunit) %]
+           </td>
+          </tr>
+        [%- END %]
+        [%- UNLESS is_service %]
+          <tr>
+           <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
+           <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
+          </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'ROP' | $T8 %]</th>
+           <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
+          </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Bin' | $T8 %]</th>
+           <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
+          </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
+           <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
+          </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Business Volume' | $T8 %]</th>
+           <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
+          </tr>
+          <tr>
+           <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
+           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
+          </tr>
+        [%- END %]
+        [%- IF id %]
+          <tr>
+           <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
+           <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
+          </tr>
+        [%- END %]
+          <tr>
+           <th align="right" nowrap><label for="shop">[% 'Has serial number' | $T8 %]</label></th>
+           <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
+          </tr>
+          <tr>
+           <th align="right" nowrap><label for="shop">[% 'Shopartikel' | $T8 %]</label></th>
+           <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+
+
+    [% UNLESS is_service %]
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <th align="right" nowrap>[% 'Image' | $T8 %]</th>
+        <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
+        <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
+        <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
+        <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+    [%- END %]
+
+    <script type="text/javascript">
+     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
+    </script>
diff --git a/templates/webpages/ic/form_header_de.html b/templates/webpages/ic/form_header_de.html
deleted file mode 100644 (file)
index d78717d..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="fokus()">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/parts_language_selection.js"></script>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" name="ic" action="[% script %]">
-
-  <input name="id" type="hidden" value="[% HTML.escape(id) %]">
-  <input name="item" type="hidden" value="[% HTML.escape(item) %]">
-  <input name="title" type="hidden" value="[% HTML.escape(title) %]">
-  <input name="makemodel" type="hidden" value="[% HTML.escape(makemodel) %]">
-  <input name="alternate" type="hidden" value="[% HTML.escape(alternate) %]">
-  <input name="onhand" type="hidden" value="[% HTML.escape(onhand) %]">
-  <input name="orphaned" type="hidden" value="[% HTML.escape(orphaned) %]">
-  <input name="taxaccounts" type="hidden" value="[% HTML.escape(taxaccounts) %]">
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="eur" type="hidden" value="[% HTML.escape(eur) %]">
-  <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
-  <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="master_data">Stammdaten</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-  <div id="master_data" class="tabcontent">
-
-   <table width="100%">
-    <tr>
-     <td>
-      <table width="100%">
-       <tr valign="top">
-        <td>
-         <table>
-          <tr>
-           <td colspan="2">
-            <table>
-             <tr>
-              <th align="right">Artikelnummer</th>
-              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
-             </tr>
-             <tr>
-              <th align="right">Artikelbeschreibung</th>
-              <td>
-               [%- IF description_area %]
-               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
-               [%- ELSE %]
-               <input name="description" size="40" value="[% HTML.escape(description) %]">
-               [%- END %]
-              </td>
-             </tr>
-             <tr>
-               <th align="right">EAN-Code</th>
-               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
-             </tr>
-             <tr>
-              [%- IF all_partsgroup.size %]
-              <th align="right">Warengruppe</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'partsgroup',
-                     DATA       = all_partsgroup,
-                     show_empty = 1,
-                     id_sub     = 'pg_keys',
-                     label_key  = 'partsgroup',
-                     style      = 'width:250px'
-               -%]
-              </td>
-              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
-              [% END %]
-             </tr>
-
-
-             [%- IF BUCHUNGSGRUPPEN.size %]
-             <tr>
-              <th align="right">Buchungsgruppe</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'buchungsgruppen_id',
-                     DATA       = BUCHUNGSGRUPPEN,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-             </tr>
-             [%- END %]
-             <input type="hidden" name="IC_income" value="[% HTML.escape(IC_income_default) %]">
-             [%- UNLESS is_assembly %]
-             <input type="hidden" name="IC_expense" value="[% HTML.escape(IC_expense_default) %]">
-             [%- END %]
-             [%- IF is_part %]
-             <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
-             [%- END %]
-             <tr>
-              <th align="right">Zahlungskonditionen</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-              </td>
-             </tr>
-            </table>
-           </td>
-          </tr>
-
-          <tr>
-           <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')">Spracheinstellungen</button>
-           </td>
-          </tr>
-
-          <tr height="5"></tr>
-
-          <tr>
-           <td>
-            <table>
-             <tr>
-              <th align="left">Bemerkungen</th>
-              [%- UNLESS is_service %]
-              <th align="left">Formel</th>
-              [%- END %]
-             </tr>
-             <tr>
-              <td>
-               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
-              </td>
-              [%- UNLESS is_service %]
-              <td>
-               <ilayer>
-                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname = Variable Einheit;<br>Variablenname2 = Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Variablennamen und Einheiten dürfen nur aus alphanumerischen Zeichen bestehen.<br>Es muss jeweils die Gesamte Zeile eingegeben werden')">
-                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
-               </td>
-              [%- END %]
-             </tr>
-            </table>
-           </td>
-          </tr>
-         </table>
-        </td>
-
-        <td>
-         <table>
-          <tr>
-           <th align="right" nowrap="true">Erneuert am</th>
-           <td>
-            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
-           </td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true">Listenpreis</th>
-           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true">Verkaufspreis</th>
-           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
-          </tr>
-
-          [%- UNLESS is_assembly %]
-          <tr>
-           <th align="right" nowrap="true">Einkaufspreis</th>
-           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
-          </tr>
-          [%- END %]
-
-          [%- IF ALL_PRICE_FACTORS.size %]
-          <tr>
-           <th align="right">Preisfaktor</th>
-           <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = 'price_factor_id',
-                  DATA       = ALL_PRICE_FACTORS,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-                  style      = 'width:100px'
-            -%]
-           </td>
-          </tr>
-          [%- END %]
-
-          <tr>
-           <th align="right" nowrap="true">Einheit</th>
-           <td>
-            <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
-            [%- UNLESS unit_changeable %]
-            <input type="hidden" name="unit" value="[% HTML.escape(unit) %]">[% HTML.escape(unit) %]
-            [%- ELSE %]
-            [%- INCLUDE generic/multibox.html
-                  name       = 'unit',
-                  DATA       = ALL_UNITS,
-                  id_key     = 'name',
-                  label_key  = 'name',
-                  style      = 'width:100px'
-            -%]
-            [%- END %]
-           </td>
-          </tr>
-
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap="true">Gewicht</th>
-           <td>
-            [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
-            <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
-            [% HTML.escape(defaults.weightunit) %]
-           </td>
-          </tr>
-        [%- END %]
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap>Auf Lager</th>
-           <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Mindestlagerbestand</th>
-           <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Lagerplatz</th>
-           <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Verrechnungseinheit</th>
-           <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Geschäftsvolumen</th>
-           <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="not_discountable">Nicht rabattierfähig</label></th>
-           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-        [%- IF id %]
-          <tr>
-           <th align="right" nowrap="true"><label for="obsolete">Ungültig</label></th>
-           <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-          <tr>
-           <th align="right" nowrap><label for="shop">Hat eine Serienummer</label></th>
-           <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="shop">Shopartikel</label></th>
-           <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-
-    [% UNLESS is_service %]
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Grafik</th>
-        <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
-        <th align="right" nowrap>Mikrofilm</th>
-        <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Zeichnung</th>
-        <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    [%- END %]
-
-    <script type="text/javascript">
-     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
-    </script>
diff --git a/templates/webpages/ic/form_header_en.html b/templates/webpages/ic/form_header_en.html
deleted file mode 100644 (file)
index cab0f36..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="fokus()">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/parts_language_selection.js"></script>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" name="ic" action="[% script %]">
-
-  <input name="id" type="hidden" value="[% HTML.escape(id) %]">
-  <input name="item" type="hidden" value="[% HTML.escape(item) %]">
-  <input name="title" type="hidden" value="[% HTML.escape(title) %]">
-  <input name="makemodel" type="hidden" value="[% HTML.escape(makemodel) %]">
-  <input name="alternate" type="hidden" value="[% HTML.escape(alternate) %]">
-  <input name="onhand" type="hidden" value="[% HTML.escape(onhand) %]">
-  <input name="orphaned" type="hidden" value="[% HTML.escape(orphaned) %]">
-  <input name="taxaccounts" type="hidden" value="[% HTML.escape(taxaccounts) %]">
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="eur" type="hidden" value="[% HTML.escape(eur) %]">
-  <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
-  <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="master_data">Master Data</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Custom Variables</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-  <div id="master_data" class="tabcontent">
-
-   <table width="100%">
-    <tr>
-     <td>
-      <table width="100%">
-       <tr valign="top">
-        <td>
-         <table>
-          <tr>
-           <td colspan="2">
-            <table>
-             <tr>
-              <th align="right">Part Number</th>
-              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
-             </tr>
-             <tr>
-              <th align="right">Part Description</th>
-              <td>
-               [%- IF description_area %]
-               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
-               [%- ELSE %]
-               <input name="description" size="40" value="[% HTML.escape(description) %]">
-               [%- END %]
-              </td>
-             </tr>
-             <tr>
-               <th align="right">EAN-Code</th>
-               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
-             </tr>
-             <tr>
-              [%- IF all_partsgroup.size %]
-              <th align="right">Group</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'partsgroup',
-                     DATA       = all_partsgroup,
-                     show_empty = 1,
-                     id_sub     = 'pg_keys',
-                     label_key  = 'partsgroup',
-                     style      = 'width:250px'
-               -%]
-              </td>
-              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
-              [% END %]
-             </tr>
-
-
-             [%- IF BUCHUNGSGRUPPEN.size %]
-             <tr>
-              <th align="right">Buchungsgruppe</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'buchungsgruppen_id',
-                     DATA       = BUCHUNGSGRUPPEN,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-             </tr>
-             [%- END %]
-             <input type="hidden" name="IC_income" value="[% HTML.escape(IC_income_default) %]">
-             [%- UNLESS is_assembly %]
-             <input type="hidden" name="IC_expense" value="[% HTML.escape(IC_expense_default) %]">
-             [%- END %]
-             [%- IF is_part %]
-             <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
-             [%- END %]
-             <tr>
-              <th align="right">Payment Terms</th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-              </td>
-             </tr>
-            </table>
-           </td>
-          </tr>
-
-          <tr>
-           <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')">Set Language Values</button>
-           </td>
-          </tr>
-
-          <tr height="5"></tr>
-
-          <tr>
-           <td>
-            <table>
-             <tr>
-              <th align="left">Notes</th>
-              [%- UNLESS is_service %]
-              <th align="left">Formula</th>
-              [%- END %]
-             </tr>
-             <tr>
-              <td>
-               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
-              </td>
-              [%- UNLESS is_service %]
-              <td>
-               <ilayer>
-                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>')">
-                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
-               </td>
-              [%- END %]
-             </tr>
-            </table>
-           </td>
-          </tr>
-         </table>
-        </td>
-
-        <td>
-         <table>
-          <tr>
-           <th align="right" nowrap="true">Updated</th>
-           <td>
-            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
-           </td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true">List Price</th>
-           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true">Sell Price</th>
-           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
-          </tr>
-
-          [%- UNLESS is_assembly %]
-          <tr>
-           <th align="right" nowrap="true">Last Cost</th>
-           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
-          </tr>
-          [%- END %]
-
-          [%- IF ALL_PRICE_FACTORS.size %]
-          <tr>
-           <th align="right">Price Factor</th>
-           <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = 'price_factor_id',
-                  DATA       = ALL_PRICE_FACTORS,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-                  style      = 'width:100px'
-            -%]
-           </td>
-          </tr>
-          [%- END %]
-
-          <tr>
-           <th align="right" nowrap="true">Unit</th>
-           <td>
-            <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
-            [%- UNLESS unit_changeable %]
-            <input type="hidden" name="unit" value="[% HTML.escape(unit) %]">[% HTML.escape(unit) %]
-            [%- ELSE %]
-            [%- INCLUDE generic/multibox.html
-                  name       = 'unit',
-                  DATA       = ALL_UNITS,
-                  id_key     = 'name',
-                  label_key  = 'name',
-                  style      = 'width:100px'
-            -%]
-            [%- END %]
-           </td>
-          </tr>
-
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap="true">Weight</th>
-           <td>
-            [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
-            <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
-            [% HTML.escape(defaults.weightunit) %]
-           </td>
-          </tr>
-        [%- END %]
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap>On Hand</th>
-           <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">ROP</th>
-           <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Bin</th>
-           <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Verrechnungseinheit</th>
-           <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true">Business Volume</th>
-           <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="not_discountable">Not Discountable</label></th>
-           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-        [%- IF id %]
-          <tr>
-           <th align="right" nowrap="true"><label for="obsolete">Obsolete</label></th>
-           <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-          <tr>
-           <th align="right" nowrap><label for="shop">Has serial number</label></th>
-           <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="shop">Shopartikel</label></th>
-           <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-
-    [% UNLESS is_service %]
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Image</th>
-        <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
-        <th align="right" nowrap>Microfiche</th>
-        <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Drawing</th>
-        <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    [%- END %]
-
-    <script type="text/javascript">
-     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
-    </script>
diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
deleted file mode 100644 (file)
index 8635b41..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="fokus()">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/parts_language_selection.js"></script>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" name="ic" action="[% script %]">
-
-  <input name="id" type="hidden" value="[% HTML.escape(id) %]">
-  <input name="item" type="hidden" value="[% HTML.escape(item) %]">
-  <input name="title" type="hidden" value="[% HTML.escape(title) %]">
-  <input name="makemodel" type="hidden" value="[% HTML.escape(makemodel) %]">
-  <input name="alternate" type="hidden" value="[% HTML.escape(alternate) %]">
-  <input name="onhand" type="hidden" value="[% HTML.escape(onhand) %]">
-  <input name="orphaned" type="hidden" value="[% HTML.escape(orphaned) %]">
-  <input name="taxaccounts" type="hidden" value="[% HTML.escape(taxaccounts) %]">
-  <input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
-  <input name="eur" type="hidden" value="[% HTML.escape(eur) %]">
-  <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
-  <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="master_data"><translate>Master Data</translate></a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-  <div id="master_data" class="tabcontent">
-
-   <table width="100%">
-    <tr>
-     <td>
-      <table width="100%">
-       <tr valign="top">
-        <td>
-         <table>
-          <tr>
-           <td colspan="2">
-            <table>
-             <tr>
-              <th align="right"><translate>Part Number</translate></th>
-              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
-             </tr>
-             <tr>
-              <th align="right"><translate>Part Description</translate></th>
-              <td>
-               [%- IF description_area %]
-               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
-               [%- ELSE %]
-               <input name="description" size="40" value="[% HTML.escape(description) %]">
-               [%- END %]
-              </td>
-             </tr>
-             <tr>
-               <th align="right"><translate>EAN-Code</translate></th>
-               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
-             </tr>
-             <tr>
-              [%- IF all_partsgroup.size %]
-              <th align="right"><translate>Group</translate></th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'partsgroup',
-                     DATA       = all_partsgroup,
-                     show_empty = 1,
-                     id_sub     = 'pg_keys',
-                     label_key  = 'partsgroup',
-                     style      = 'width:250px'
-               -%]
-              </td>
-              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
-              [% END %]
-             </tr>
-
-
-             [%- IF BUCHUNGSGRUPPEN.size %]
-             <tr>
-              <th align="right"><translate>Buchungsgruppe</translate></th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'buchungsgruppen_id',
-                     DATA       = BUCHUNGSGRUPPEN,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-             </tr>
-             [%- END %]
-             <input type="hidden" name="IC_income" value="[% HTML.escape(IC_income_default) %]">
-             [%- UNLESS is_assembly %]
-             <input type="hidden" name="IC_expense" value="[% HTML.escape(IC_expense_default) %]">
-             [%- END %]
-             [%- IF is_part %]
-             <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
-             [%- END %]
-             <tr>
-              <th align="right"><translate>Payment Terms</translate></th>
-              <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-                     style      = 'width:250px'
-               -%]
-              </td>
-             </tr>
-            </table>
-           </td>
-          </tr>
-
-          <tr>
-           <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')"><translate>Set Language Values</translate></button>
-           </td>
-          </tr>
-
-          <tr height="5"></tr>
-
-          <tr>
-           <td>
-            <table>
-             <tr>
-              <th align="left"><translate>Notes</translate></th>
-              [%- UNLESS is_service %]
-              <th align="left"><translate>Formula</translate></th>
-              [%- END %]
-             </tr>
-             <tr>
-              <td>
-               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
-              </td>
-              [%- UNLESS is_service %]
-              <td>
-               <ilayer>
-                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br></translate>')">
-                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
-               </td>
-              [%- END %]
-             </tr>
-            </table>
-           </td>
-          </tr>
-         </table>
-        </td>
-
-        <td>
-         <table>
-          <tr>
-           <th align="right" nowrap="true"><translate>Updated</translate></th>
-           <td>
-            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
-           </td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true"><translate>List Price</translate></th>
-           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
-          </tr>
-
-          <tr>
-           <th align="right" nowrap="true"><translate>Sell Price</translate></th>
-           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
-          </tr>
-
-          [%- UNLESS is_assembly %]
-          <tr>
-           <th align="right" nowrap="true"><translate>Last Cost</translate></th>
-           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
-          </tr>
-          [%- END %]
-
-          [%- IF ALL_PRICE_FACTORS.size %]
-          <tr>
-           <th align="right"><translate>Price Factor</translate></th>
-           <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = 'price_factor_id',
-                  DATA       = ALL_PRICE_FACTORS,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-                  style      = 'width:100px'
-            -%]
-           </td>
-          </tr>
-          [%- END %]
-
-          <tr>
-           <th align="right" nowrap="true"><translate>Unit</translate></th>
-           <td>
-            <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
-            [%- UNLESS unit_changeable %]
-            <input type="hidden" name="unit" value="[% HTML.escape(unit) %]">[% HTML.escape(unit) %]
-            [%- ELSE %]
-            [%- INCLUDE generic/multibox.html
-                  name       = 'unit',
-                  DATA       = ALL_UNITS,
-                  id_key     = 'name',
-                  label_key  = 'name',
-                  style      = 'width:100px'
-            -%]
-            [%- END %]
-           </td>
-          </tr>
-
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap="true"><translate>Weight</translate></th>
-           <td>
-            [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
-            <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
-            [% HTML.escape(defaults.weightunit) %]
-           </td>
-          </tr>
-        [%- END %]
-        [%- UNLESS is_service %]
-          <tr>
-           <th align="right" nowrap><translate>On Hand</translate></th>
-           <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true"><translate>ROP</translate></th>
-           <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true"><translate>Bin</translate></th>
-           <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true"><translate>Verrechnungseinheit</translate></th>
-           <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap="true"><translate>Business Volume</translate></th>
-           <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="not_discountable"><translate>Not Discountable</translate></label></th>
-           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-        [%- IF id %]
-          <tr>
-           <th align="right" nowrap="true"><label for="obsolete"><translate>Obsolete</translate></label></th>
-           <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-          </tr>
-        [%- END %]
-          <tr>
-           <th align="right" nowrap><label for="shop"><translate>Has serial number</translate></label></th>
-           <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
-          </tr>
-          <tr>
-           <th align="right" nowrap><label for="shop"><translate>Shopartikel</translate></label></th>
-           <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-
-    [% UNLESS is_service %]
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap><translate>Image</translate></th>
-        <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
-        <th align="right" nowrap><translate>Microfiche</translate></th>
-        <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Drawing</translate></th>
-        <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-    [%- END %]
-
-    <script type="text/javascript">
-     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
-    </script>
diff --git a/templates/webpages/ic/generate_report_bottom.html b/templates/webpages/ic/generate_report_bottom.html
new file mode 100644 (file)
index 0000000..17d42af
--- /dev/null
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+[% USE HTML %]<form method="post" action="ic.pl">
+
+ <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+
+ <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
+
+ [% SWITCH searchitems %]
+   [% CASE 'part' %][% 'New part' | $T8 %]
+   [% CASE 'service' %][% 'New service' | $T8 %]
+   [% CASE 'assembly' %][% 'New assembly' | $T8 %]
+ [% END %]
+ <br>
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
+
+</form>
diff --git a/templates/webpages/ic/generate_report_bottom_de.html b/templates/webpages/ic/generate_report_bottom_de.html
deleted file mode 100644 (file)
index b6c6767..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<form method="post" action="ic.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
-
- [% SWITCH searchitems %]
-   [% CASE 'part' %]Neue Ware
-   [% CASE 'service' %]Neue Dienstleistung
-   [% CASE 'assembly' %]Neues Erzeugnis
- [% END %]
- <br>
- <input class="submit" type="submit" name="action" value="Erfassen">
-
-</form>
diff --git a/templates/webpages/ic/generate_report_bottom_en.html b/templates/webpages/ic/generate_report_bottom_en.html
deleted file mode 100644 (file)
index 0654155..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<form method="post" action="ic.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
-
- [% SWITCH searchitems %]
-   [% CASE 'part' %]New part
-   [% CASE 'service' %]New service
-   [% CASE 'assembly' %]New assembly
- [% END %]
- <br>
- <input class="submit" type="submit" name="action" value="Add">
-
-</form>
diff --git a/templates/webpages/ic/generate_report_bottom_master.html b/templates/webpages/ic/generate_report_bottom_master.html
deleted file mode 100644 (file)
index ede375c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[% USE HTML %]<form method="post" action="ic.pl">
-
- <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
-
- <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
-
- [% SWITCH searchitems %]
-   [% CASE 'part' %]<translate>New part</translate>
-   [% CASE 'service' %]<translate>New service</translate>
-   [% CASE 'assembly' %]<translate>New assembly</translate>
- [% END %]
- <br>
- <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
-
-</form>
diff --git a/templates/webpages/ic/makemodel.html b/templates/webpages/ic/makemodel.html
new file mode 100644 (file)
index 0000000..6412124
--- /dev/null
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <th class="listheading">[% 'Make' | $T8 %]</th>
+          <th class="listheading">[% 'Model' | $T8 %]</th>
+        </tr>
+      [%- FOREACH row = MM_DATA %]
+        <tr>
+          <td>
+            [%- INCLUDE generic/multibox.html
+                  name       = "make_$loop.count",
+                  default    = row.make,
+                  DATA       = ALL_VENDORS,
+                  show_empty = 1,
+                  label_key  = 'name',
+                  id_key     = 'id',
+            -%]
+          </td>
+          <td><input name="model_[% loop.count %]" size="30" value="[% HTML.escape(row.model) %]"></td>
+        </tr>
+      [%- END %]
+      </table>
+    </td>
+  </tr>
+  <input type="hidden" name="makemodel_rows" value="[% mm_rows %]">
diff --git a/templates/webpages/ic/makemodel_de.html b/templates/webpages/ic/makemodel_de.html
deleted file mode 100644 (file)
index dd4d038..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th class="listheading">Lieferant</th>
-          <th class="listheading">Lieferanten-Art-Nr.</th>
-        </tr>
-      [%- FOREACH row = MM_DATA %]
-        <tr>
-          <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = "make_$loop.count",
-                  default    = row.make,
-                  DATA       = ALL_VENDORS,
-                  show_empty = 1,
-                  label_key  = 'name',
-                  id_key     = 'id',
-            -%]
-          </td>
-          <td><input name="model_[% loop.count %]" size="30" value="[% HTML.escape(row.model) %]"></td>
-        </tr>
-      [%- END %]
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="makemodel_rows" value="[% mm_rows %]">
diff --git a/templates/webpages/ic/makemodel_en.html b/templates/webpages/ic/makemodel_en.html
deleted file mode 100644 (file)
index 9cb1ea0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th class="listheading">Make</th>
-          <th class="listheading">Model</th>
-        </tr>
-      [%- FOREACH row = MM_DATA %]
-        <tr>
-          <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = "make_$loop.count",
-                  default    = row.make,
-                  DATA       = ALL_VENDORS,
-                  show_empty = 1,
-                  label_key  = 'name',
-                  id_key     = 'id',
-            -%]
-          </td>
-          <td><input name="model_[% loop.count %]" size="30" value="[% HTML.escape(row.model) %]"></td>
-        </tr>
-      [%- END %]
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="makemodel_rows" value="[% mm_rows %]">
diff --git a/templates/webpages/ic/makemodel_master.html b/templates/webpages/ic/makemodel_master.html
deleted file mode 100644 (file)
index 696080e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th class="listheading"><translate>Make</translate></th>
-          <th class="listheading"><translate>Model</translate></th>
-        </tr>
-      [%- FOREACH row = MM_DATA %]
-        <tr>
-          <td>
-            [%- INCLUDE generic/multibox.html
-                  name       = "make_$loop.count",
-                  default    = row.make,
-                  DATA       = ALL_VENDORS,
-                  show_empty = 1,
-                  label_key  = 'name',
-                  id_key     = 'id',
-            -%]
-          </td>
-          <td><input name="model_[% loop.count %]" size="30" value="[% HTML.escape(row.model) %]"></td>
-        </tr>
-      [%- END %]
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="makemodel_rows" value="[% mm_rows %]">
diff --git a/templates/webpages/ic/parts_language_selection.html b/templates/webpages/ic/parts_language_selection.html
new file mode 100644 (file)
index 0000000..95ed20d
--- /dev/null
@@ -0,0 +1,64 @@
+[%- USE T8 %]
+[% USE HTML %]<body onload="[% onload %]">
+
+ <form name="Form">
+
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>[% 'Please insert your language values below' | $T8 %]</p>
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th class="listheading">&nbsp;</th>
+     [%- FOREACH col = HEADER %]
+     <th nowrap class="listheading">[% col.column_title %]</th>
+     [%- END %]
+    </tr>
+
+    [%- FOREACH row = LANGUAGES %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <td><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</td>
+     <td><input  id="translation_[% loop.count %]" name="translation_[% loop.count %]" value="[% HTML.escape(row.translation) %]"></td>
+     <td><input  id="longdescription_[% loop.count %]" name="longdescription_[% loop.count %]" value="[% HTML.escape(row.longdescription) %]"></td>
+    </tr>
+
+    [%- IF loop.last %]
+    <input type="hidden" id="rowcount" name="rowcount" value="[% loop.count %]">
+    [%- END %]
+    [%- END %]
+   </table>
+  </p>
+
+  <p>
+   <button type="button" onclick="languages_updated()">[% 'Close' | $T8 %]</button>
+  </p>
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      function languages_updated() {
+        var languages = "";
+        for (var i = 1; i <= (document.getElementsByName("rowcount")[0].value); i++) {
+          var id              = "id_" + i ;
+          var translation     = "translation_" + i ;
+          var longdescription = "longdescription_" + i;
+
+          languages = languages +
+            "---+++---" + document.getElementsByName( id )[0].value +
+            "--++--" + document.getElementsByName( translation )[0].value +
+            "--++--"  + document.getElementsByName( longdescription )[0].value;
+        }
+
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = languages;
+
+        self.close();
+      }
+      //-->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/ic/parts_language_selection_de.html b/templates/webpages/ic/parts_language_selection_de.html
deleted file mode 100644 (file)
index 26d08fb..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Bitte die Übersetzungen unten eintragen</p>
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     [%- FOREACH col = HEADER %]
-     <th nowrap class="listheading">[% col.column_title %]</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH row = LANGUAGES %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</td>
-     <td><input  id="translation_[% loop.count %]" name="translation_[% loop.count %]" value="[% HTML.escape(row.translation) %]"></td>
-     <td><input  id="longdescription_[% loop.count %]" name="longdescription_[% loop.count %]" value="[% HTML.escape(row.longdescription) %]"></td>
-    </tr>
-
-    [%- IF loop.last %]
-    <input type="hidden" id="rowcount" name="rowcount" value="[% loop.count %]">
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <button type="button" onclick="languages_updated()">Übernehmen</button>
-  </p>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function languages_updated() {
-        var languages = "";
-        for (var i = 1; i <= (document.getElementsByName("rowcount")[0].value); i++) {
-          var id              = "id_" + i ;
-          var translation     = "translation_" + i ;
-          var longdescription = "longdescription_" + i;
-
-          languages = languages +
-            "---+++---" + document.getElementsByName( id )[0].value +
-            "--++--" + document.getElementsByName( translation )[0].value +
-            "--++--"  + document.getElementsByName( longdescription )[0].value;
-        }
-
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = languages;
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/parts_language_selection_en.html b/templates/webpages/ic/parts_language_selection_en.html
deleted file mode 100644 (file)
index 17e904b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Please insert your language values below</p>
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     [%- FOREACH col = HEADER %]
-     <th nowrap class="listheading">[% col.column_title %]</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH row = LANGUAGES %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</td>
-     <td><input  id="translation_[% loop.count %]" name="translation_[% loop.count %]" value="[% HTML.escape(row.translation) %]"></td>
-     <td><input  id="longdescription_[% loop.count %]" name="longdescription_[% loop.count %]" value="[% HTML.escape(row.longdescription) %]"></td>
-    </tr>
-
-    [%- IF loop.last %]
-    <input type="hidden" id="rowcount" name="rowcount" value="[% loop.count %]">
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <button type="button" onclick="languages_updated()">Close</button>
-  </p>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function languages_updated() {
-        var languages = "";
-        for (var i = 1; i <= (document.getElementsByName("rowcount")[0].value); i++) {
-          var id              = "id_" + i ;
-          var translation     = "translation_" + i ;
-          var longdescription = "longdescription_" + i;
-
-          languages = languages +
-            "---+++---" + document.getElementsByName( id )[0].value +
-            "--++--" + document.getElementsByName( translation )[0].value +
-            "--++--"  + document.getElementsByName( longdescription )[0].value;
-        }
-
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = languages;
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/parts_language_selection_master.html b/templates/webpages/ic/parts_language_selection_master.html
deleted file mode 100644 (file)
index 9a8060e..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-[% USE HTML %]<body onload="[% onload %]">
-
- <form name="Form">
-
-  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p><translate>Please insert your language values below</translate></p>
-
-  <p>
-   <table>
-    <tr class="listheading">
-     <th class="listheading">&nbsp;</th>
-     [%- FOREACH col = HEADER %]
-     <th nowrap class="listheading">[% col.column_title %]</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH row = LANGUAGES %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <td><input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</td>
-     <td><input  id="translation_[% loop.count %]" name="translation_[% loop.count %]" value="[% HTML.escape(row.translation) %]"></td>
-     <td><input  id="longdescription_[% loop.count %]" name="longdescription_[% loop.count %]" value="[% HTML.escape(row.longdescription) %]"></td>
-    </tr>
-
-    [%- IF loop.last %]
-    <input type="hidden" id="rowcount" name="rowcount" value="[% loop.count %]">
-    [%- END %]
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <button type="button" onclick="languages_updated()"><translate>Close</translate></button>
-  </p>
-
- </form>
-
- <script type="text/javascript">
-  <!--
-      function languages_updated() {
-        var languages = "";
-        for (var i = 1; i <= (document.getElementsByName("rowcount")[0].value); i++) {
-          var id              = "id_" + i ;
-          var translation     = "translation_" + i ;
-          var longdescription = "longdescription_" + i;
-
-          languages = languages +
-            "---+++---" + document.getElementsByName( id )[0].value +
-            "--++--" + document.getElementsByName( translation )[0].value +
-            "--++--"  + document.getElementsByName( longdescription )[0].value;
-        }
-
-        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = languages;
-
-        self.close();
-      }
-      //-->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/price_row.html b/templates/webpages/ic/price_row.html
new file mode 100644 (file)
index 0000000..09a7b6e
--- /dev/null
@@ -0,0 +1,22 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- IF PRICES.size %]
+  <tr>
+    <td>
+      <table width=100%>
+        <tr>
+          <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+          <th class="listheading">[% 'Preis' | $T8 %]</th>
+        </tr>
+[%- FOREACH row = PRICES %]
+        <tr>
+          <td width=50%><input type=hidden name="pricegroup_[% loop.count %]" size=30  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
+          <td width=50%><input name="price_[% loop.count %]" size=11 value="[% LxERP.format_amount(row.price, -2) %]"></td>
+          <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.pricegroup_id) %]">
+        </tr>
+[%- END %]
+      </table>
+    </td>
+  </tr>
+[%- END %]
diff --git a/templates/webpages/ic/price_row_de.html b/templates/webpages/ic/price_row_de.html
deleted file mode 100644 (file)
index 421256f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- IF PRICES.size %]
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-          <th class="listheading">Preisgruppe</th>
-          <th class="listheading">Preis</th>
-        </tr>
-[%- FOREACH row = PRICES %]
-        <tr>
-          <td width=50%><input type=hidden name="pricegroup_[% loop.count %]" size=30  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-          <td width=50%><input name="price_[% loop.count %]" size=11 value="[% LxERP.format_amount(row.price, -2) %]"></td>
-          <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.pricegroup_id) %]">
-        </tr>
-[%- END %]
-      </table>
-    </td>
-  </tr>
-[%- END %]
diff --git a/templates/webpages/ic/price_row_en.html b/templates/webpages/ic/price_row_en.html
deleted file mode 100644 (file)
index 1d4fb36..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- IF PRICES.size %]
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-          <th class="listheading">Preisklasse</th>
-          <th class="listheading">Preis</th>
-        </tr>
-[%- FOREACH row = PRICES %]
-        <tr>
-          <td width=50%><input type=hidden name="pricegroup_[% loop.count %]" size=30  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-          <td width=50%><input name="price_[% loop.count %]" size=11 value="[% LxERP.format_amount(row.price, -2) %]"></td>
-          <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.pricegroup_id) %]">
-        </tr>
-[%- END %]
-      </table>
-    </td>
-  </tr>
-[%- END %]
diff --git a/templates/webpages/ic/price_row_master.html b/templates/webpages/ic/price_row_master.html
deleted file mode 100644 (file)
index 56bae69..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- IF PRICES.size %]
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-          <th class="listheading"><translate>Preisklasse</translate></th>
-          <th class="listheading"><translate>Preis</translate></th>
-        </tr>
-[%- FOREACH row = PRICES %]
-        <tr>
-          <td width=50%><input type=hidden name="pricegroup_[% loop.count %]" size=30  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-          <td width=50%><input name="price_[% loop.count %]" size=11 value="[% LxERP.format_amount(row.price, -2) %]"></td>
-          <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.pricegroup_id) %]">
-        </tr>
-[%- END %]
-      </table>
-    </td>
-  </tr>
-[%- END %]
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
new file mode 100644 (file)
index 0000000..25625a5
--- /dev/null
@@ -0,0 +1,287 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body>
+
+ <form method="post" action="ic.pl">
+
+  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
+  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+
+  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
+  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
+
+  <input type="hidden" name="nextsub" value="generate_report">
+  <input type="hidden" name="sort" value="description">
+
+  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+   <tr valign="top">
+    <td>
+     <table>
+      <tr>
+       <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
+       <td><input name="partnumber" size="20"></td>
+       <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
+       <td><input name="ean" size="20"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
+       <td colspan="3"><input name="description" size="40"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Group' | $T8 %]</th>
+       <td><input name="partsgroup" size="20"></td>
+       [%- UNLESS is_service %]
+       <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
+       [%- END %]
+      </tr>
+
+      [%- UNLESS is_service %]
+      <tr>
+       <th align="right" nowrap>[% 'Make' | $T8 %]</th> <td><input name="make" size="20"></td>
+       <th align="right" nowrap>[% 'Model' | $T8 %]</th> <td><input name="model" size="20"></td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
+       <td><input name="drawing" size="20"></td>
+       <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
+       <td><input name="microfiche" size="20"></td>
+      </tr>
+
+      [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+      [%- IF is_assembly %]
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">[% 'Top Level' | $T8 %]</label>
+        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">[% 'Individual Items' | $T8 %]</label>
+       </td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
+        <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
+        [%- UNLESS is_service %]
+        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
+        <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
+        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
+        <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
+        [%- END %]
+        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
+        <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
+        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
+        <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
+       </td>
+      </tr>
+
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <table>
+         <tr>
+          <td>
+           <table>
+            <tr>
+             [%- UNLESS is_assembly %]
+             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="bought">[% 'Bought' | $T8 %]</label></td>
+             [%- END %]
+             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="sold">[% 'Sold' | $T8 %]</label></td>
+            </tr>
+
+            <tr>
+             <td colspan="4"><hr size="1" noshade></td>
+            </tr>
+
+            <tr>
+             [%- UNLESS is_assembly %]
+             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="onorder">[% 'On Order' | $T8 %]</label></td>
+             [%- END %]
+             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="ordered">[% 'Ordered' | $T8 %]</label></td>
+            </tr>
+
+            <tr>
+             <td colspan="4"><hr size="1" noshade></td>
+            </tr>
+
+            <tr>
+             [%- UNLESS is_assembly %]
+             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="rfq">[% 'RFQ' | $T8 %]</label></td>
+             [%- END %]
+             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="quoted">[% 'Quoted' | $T8 %]</label></td>
+            </tr>
+           </table>
+          </td>
+
+          <td width="5%">&nbsp;</td>
+
+          <td>
+           <table>
+            <tr>
+             <th>[% 'From' | $T8 %]</th>
+             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdatefrom" id="trigger1" value="[% 'button' | $T8 %]"></td>
+             <th>[% 'To (time)' | $T8 %]</th>
+             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="[% 'button' | $T8 %]"></td>
+            </tr>
+           </table>
+          </td>
+         </tr>
+        </table>
+       </td>
+      </tr>
+
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <hr size="1" noshade>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th> <td colspan="3">
+        <table>
+         <tr>
+          <td>
+           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_partnumber">[% 'Part Number' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_description">[% 'Part Description' | $T8 %]</label>
+          </td>
+          [%- UNLESS is_service %]
+          <td>
+           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
+           <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
+          </td>
+          [%- END %]
+          <td>
+           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>
+          </td>
+         </tr>
+
+         <tr>
+          <td>
+           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
+           <label for="l_listprice">[% 'List Price' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_sellprice">[% 'Sell Price' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_lastcost">[% 'Last Cost' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_linetotal">[% 'Line Total' | $T8 %]</label>
+          </td>
+         </tr>
+
+         <tr>
+          <td>
+           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_priceupdate">[% 'Updated' | $T8 %]</label>
+          </td>
+          <td>
+          <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
+           <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
+           <label for="l_bin">[% 'Bin' | $T8 %]</label -->
+           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_deliverydate">[% 'deliverydate' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
+           <label for="l_rop">[% 'ROP' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
+           <label for="l_weight">[% 'Weight' | $T8 %]</label>
+          </td>
+         </tr>
+
+         <tr>
+          <td>
+           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
+           <label for="l_image">[% 'Image' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
+           <label for="l_drawing">[% 'Drawing' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
+           <label for="l_microfiche">[% 'Microfiche' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
+           <label for="l_partsgroup">[% 'Group' | $T8 %]</label>
+          </td>
+         </tr>
+
+         <tr>
+          <td>
+           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_transdate">[% 'Transdate' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_soldtotal">[% 'soldtotal' | $T8 %]</label>
+          </td>
+          <td>
+           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
+           <label for="l_ean">[% 'EAN' | $T8 %]</label>
+          </td>
+         </tr>
+
+         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+        </table>
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+   <tr><td colspan="4"><hr size="3" noshade></td></tr>
+  </table>
+
+  <script type="text/javascript">
+   <!--
+       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+       //-->
+  </script>
+
+  <p>
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'TOP100' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ic/search_de.html b/templates/webpages/ic/search_de.html
deleted file mode 100644 (file)
index 4751638..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
-  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
-  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-  <input type="hidden" name="sort" value="description">
-
-  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap>Artikelnummer</th>
-       <td><input name="partnumber" size="20"></td>
-       <th align="right" nowrap>EAN</th>
-       <td><input name="ean" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Artikelbeschreibung</th>
-       <td colspan="3"><input name="description" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Warengruppe</th>
-       <td><input name="partsgroup" size="20"></td>
-       [%- UNLESS is_service %]
-       <th align="right" nowrap>Seriennummer</th> <td><input name="serialnumber" size="20"></td>
-       [%- END %]
-      </tr>
-
-      [%- UNLESS is_service %]
-      <tr>
-       <th align="right" nowrap>Lieferant</th> <td><input name="make" size="20"></td>
-       <th align="right" nowrap>Lieferanten-Art-Nr.</th> <td><input name="model" size="20"></td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <th align="right" nowrap>Zeichnung</th>
-       <td><input name="drawing" size="20"></td>
-       <th align="right" nowrap>Mikrofilm</th>
-       <td><input name="microfiche" size="20"></td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-      [%- IF is_assembly %]
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">Hauptartikelbezeichnung</label>
-        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">Einzelteile</label>
-       </td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-        <label for="itemstatus_active">Aktiv</label>
-        [%- UNLESS is_service %]
-        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-        <label for="itemstatus_onhand">Auf Lager</label>
-        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-        <label for="itemstatus_short">Knapp</label>
-        [%- END %]
-        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-        <label for="itemstatus_obsolete">Ungültig</label>
-        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-        <label for="itemstatus_orphaned">Nie benutzt</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <table>
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="bought">Gekauft</label></td>
-             [%- END %]
-             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="sold">Verkauft</label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="onorder">Ist bestellt</label></td>
-             [%- END %]
-             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="ordered">Vom Kunde bestellt</label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="rfq">Anfrage</label></td>
-             [%- END %]
-             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="quoted">Angeboten</label></td>
-            </tr>
-           </table>
-          </td>
-
-          <td width="5%">&nbsp;</td>
-
-          <td>
-           <table>
-            <tr>
-             <th>Von</th>
-             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="?"></td>
-             <th>Bis</th>
-             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="?"></td>
-            </tr>
-           </table>
-          </td>
-         </tr>
-        </table>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <hr size="1" noshade>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>In Bericht aufnehmen</th> <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_partnumber">Artikelnummer</label>
-          </td>
-          <td>
-           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_description">Artikelbeschreibung</label>
-          </td>
-          [%- UNLESS is_service %]
-          <td>
-           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
-           <label for="l_serialnumber">Seriennummer</label>
-          </td>
-          [%- END %]
-          <td>
-           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_unit">Maßeinheit</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
-           <label for="l_listprice">Listenpreis</label>
-          </td>
-          <td>
-           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_sellprice">Verkaufspreis</label>
-          </td>
-          <td>
-           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_lastcost">Einkaufspreis</label>
-          </td>
-          <td>
-           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_linetotal">Zeilensumme</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_priceupdate">Erneuert am</label>
-          </td>
-          <td>
-          <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
-           <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
-           <label for="l_bin">Lagerplatz</label -->
-           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_deliverydate">Lieferdatum</label>
-          </td>
-          <td>
-           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
-           <label for="l_rop">Mindestlagerbestand</label>
-          </td>
-          <td>
-           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
-           <label for="l_weight">Gewicht</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
-           <label for="l_image">Grafik</label>
-          </td>
-          <td>
-           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
-           <label for="l_drawing">Zeichnung</label>
-          </td>
-          <td>
-           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
-           <label for="l_microfiche">Mikrofilm</label>
-          </td>
-          <td>
-           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
-           <label for="l_partsgroup">Warengruppe</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_transdate">Belegdatum</label>
-          </td>
-          <td>
-           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_subtotal">Zwischensumme</label>
-          </td>
-          <td>
-           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_soldtotal">Verkaufte Anzahl</label>
-          </td>
-          <td>
-           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
-           <label for="l_ean">EAN</label>
-          </td>
-         </tr>
-
-         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-        </table>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-   <tr><td colspan="4"><hr size="3" noshade></td></tr>
-  </table>
-
-  <script type="text/javascript">
-   <!--
-       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-       //-->
-  </script>
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
-   <input class="submit" type="submit" name="action" value="Top 100">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/search_en.html b/templates/webpages/ic/search_en.html
deleted file mode 100644 (file)
index 66c5870..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
-  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
-  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-  <input type="hidden" name="sort" value="description">
-
-  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap>Part Number</th>
-       <td><input name="partnumber" size="20"></td>
-       <th align="right" nowrap>EAN</th>
-       <td><input name="ean" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Part Description</th>
-       <td colspan="3"><input name="description" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Group</th>
-       <td><input name="partsgroup" size="20"></td>
-       [%- UNLESS is_service %]
-       <th align="right" nowrap>Serial Number</th> <td><input name="serialnumber" size="20"></td>
-       [%- END %]
-      </tr>
-
-      [%- UNLESS is_service %]
-      <tr>
-       <th align="right" nowrap>Make</th> <td><input name="make" size="20"></td>
-       <th align="right" nowrap>Model</th> <td><input name="model" size="20"></td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <th align="right" nowrap>Drawing</th>
-       <td><input name="drawing" size="20"></td>
-       <th align="right" nowrap>Microfiche</th>
-       <td><input name="microfiche" size="20"></td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-      [%- IF is_assembly %]
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">Top Level</label>
-        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">Individual Items</label>
-       </td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-        <label for="itemstatus_active">Active</label>
-        [%- UNLESS is_service %]
-        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-        <label for="itemstatus_onhand">On Hand</label>
-        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-        <label for="itemstatus_short">Short</label>
-        [%- END %]
-        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-        <label for="itemstatus_obsolete">Obsolete</label>
-        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-        <label for="itemstatus_orphaned">Orphaned</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <table>
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="bought">Bought</label></td>
-             [%- END %]
-             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="sold">Sold</label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="onorder">On Order</label></td>
-             [%- END %]
-             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="ordered">Ordered</label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="rfq">RFQ</label></td>
-             [%- END %]
-             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="quoted">Quoted</label></td>
-            </tr>
-           </table>
-          </td>
-
-          <td width="5%">&nbsp;</td>
-
-          <td>
-           <table>
-            <tr>
-             <th>From</th>
-             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="button"></td>
-             <th>To (time)</th>
-             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="button"></td>
-            </tr>
-           </table>
-          </td>
-         </tr>
-        </table>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <hr size="1" noshade>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap>Include in Report</th> <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_partnumber">Part Number</label>
-          </td>
-          <td>
-           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_description">Part Description</label>
-          </td>
-          [%- UNLESS is_service %]
-          <td>
-           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
-           <label for="l_serialnumber">Serial Number</label>
-          </td>
-          [%- END %]
-          <td>
-           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_unit">Unit of measure</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
-           <label for="l_listprice">List Price</label>
-          </td>
-          <td>
-           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_sellprice">Sell Price</label>
-          </td>
-          <td>
-           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_lastcost">Last Cost</label>
-          </td>
-          <td>
-           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_linetotal">Line Total</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_priceupdate">Updated</label>
-          </td>
-          <td>
-          <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
-           <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
-           <label for="l_bin">Bin</label -->
-           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_deliverydate">deliverydate</label>
-          </td>
-          <td>
-           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
-           <label for="l_rop">ROP</label>
-          </td>
-          <td>
-           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
-           <label for="l_weight">Weight</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
-           <label for="l_image">Image</label>
-          </td>
-          <td>
-           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
-           <label for="l_drawing">Drawing</label>
-          </td>
-          <td>
-           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
-           <label for="l_microfiche">Microfiche</label>
-          </td>
-          <td>
-           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
-           <label for="l_partsgroup">Group</label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_transdate">Transdate</label>
-          </td>
-          <td>
-           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_subtotal">Subtotal</label>
-          </td>
-          <td>
-           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_soldtotal">soldtotal</label>
-          </td>
-          <td>
-           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
-           <label for="l_ean">EAN</label>
-          </td>
-         </tr>
-
-         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-        </table>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-   <tr><td colspan="4"><hr size="3" noshade></td></tr>
-  </table>
-
-  <script type="text/javascript">
-   <!--
-       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-       //-->
-  </script>
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Continue">
-   <input class="submit" type="submit" name="action" value="TOP100">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html
deleted file mode 100644 (file)
index 52d3a7b..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
-  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
-  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
-  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-  <input type="hidden" name="sort" value="description">
-
-  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <table width="100%">
-   <tr height="5"></tr>
-   <tr valign="top">
-    <td>
-     <table>
-      <tr>
-       <th align="right" nowrap><translate>Part Number</translate></th>
-       <td><input name="partnumber" size="20"></td>
-       <th align="right" nowrap><translate>EAN</translate></th>
-       <td><input name="ean" size="20"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Part Description</translate></th>
-       <td colspan="3"><input name="description" size="40"></td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Group</translate></th>
-       <td><input name="partsgroup" size="20"></td>
-       [%- UNLESS is_service %]
-       <th align="right" nowrap><translate>Serial Number</translate></th> <td><input name="serialnumber" size="20"></td>
-       [%- END %]
-      </tr>
-
-      [%- UNLESS is_service %]
-      <tr>
-       <th align="right" nowrap><translate>Make</translate></th> <td><input name="make" size="20"></td>
-       <th align="right" nowrap><translate>Model</translate></th> <td><input name="model" size="20"></td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <th align="right" nowrap><translate>Drawing</translate></th>
-       <td><input name="drawing" size="20"></td>
-       <th align="right" nowrap><translate>Microfiche</translate></th>
-       <td><input name="microfiche" size="20"></td>
-      </tr>
-
-      [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-      [%- IF is_assembly %]
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1"><translate>Top Level</translate></label>
-        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom"><translate>Individual Items</translate></label>
-       </td>
-      </tr>
-      [%- END %]
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-        <label for="itemstatus_active"><translate>Active</translate></label>
-        [%- UNLESS is_service %]
-        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-        <label for="itemstatus_onhand"><translate>On Hand</translate></label>
-        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-        <label for="itemstatus_short"><translate>Short</translate></label>
-        [%- END %]
-        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-        <label for="itemstatus_obsolete"><translate>Obsolete</translate></label>
-        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-        <label for="itemstatus_orphaned"><translate>Orphaned</translate></label>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <table>
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="bought"><translate>Bought</translate></label></td>
-             [%- END %]
-             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="sold"><translate>Sold</translate></label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="onorder"><translate>On Order</translate></label></td>
-             [%- END %]
-             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="ordered"><translate>Ordered</translate></label></td>
-            </tr>
-
-            <tr>
-             <td colspan="4"><hr size="1" noshade></td>
-            </tr>
-
-            <tr>
-             [%- UNLESS is_assembly %]
-             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="rfq"><translate>RFQ</translate></label></td>
-             [%- END %]
-             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="quoted"><translate>Quoted</translate></label></td>
-            </tr>
-           </table>
-          </td>
-
-          <td width="5%">&nbsp;</td>
-
-          <td>
-           <table>
-            <tr>
-             <th><translate>From</translate></th>
-             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="<translate>button</translate>"></td>
-             <th><translate>To (time)</translate></th>
-             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="<translate>button</translate>"></td>
-            </tr>
-           </table>
-          </td>
-         </tr>
-        </table>
-       </td>
-      </tr>
-
-      <tr>
-       <td></td>
-       <td colspan="3">
-        <hr size="1" noshade>
-       </td>
-      </tr>
-
-      <tr>
-       <th align="right" nowrap><translate>Include in Report</translate></th> <td colspan="3">
-        <table>
-         <tr>
-          <td>
-           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_partnumber"><translate>Part Number</translate></label>
-          </td>
-          <td>
-           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_description"><translate>Part Description</translate></label>
-          </td>
-          [%- UNLESS is_service %]
-          <td>
-           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
-           <label for="l_serialnumber"><translate>Serial Number</translate></label>
-          </td>
-          [%- END %]
-          <td>
-           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_unit"><translate>Unit of measure</translate></label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
-           <label for="l_listprice"><translate>List Price</translate></label>
-          </td>
-          <td>
-           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_sellprice"><translate>Sell Price</translate></label>
-          </td>
-          <td>
-           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_lastcost"><translate>Last Cost</translate></label>
-          </td>
-          <td>
-           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_linetotal"><translate>Line Total</translate></label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_priceupdate"><translate>Updated</translate></label>
-          </td>
-          <td>
-          <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
-           <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
-           <label for="l_bin"><translate>Bin</translate></label -->
-           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_deliverydate"><translate>deliverydate</translate></label>
-          </td>
-          <td>
-           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
-           <label for="l_rop"><translate>ROP</translate></label>
-          </td>
-          <td>
-           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
-           <label for="l_weight"><translate>Weight</translate></label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
-           <label for="l_image"><translate>Image</translate></label>
-          </td>
-          <td>
-           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
-           <label for="l_drawing"><translate>Drawing</translate></label>
-          </td>
-          <td>
-           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
-           <label for="l_microfiche"><translate>Microfiche</translate></label>
-          </td>
-          <td>
-           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
-           <label for="l_partsgroup"><translate>Group</translate></label>
-          </td>
-         </tr>
-
-         <tr>
-          <td>
-           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_transdate"><translate>Transdate</translate></label>
-          </td>
-          <td>
-           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_subtotal"><translate>Subtotal</translate></label>
-          </td>
-          <td>
-           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_soldtotal"><translate>soldtotal</translate></label>
-          </td>
-          <td>
-           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
-           <label for="l_ean"><translate>EAN</translate></label>
-          </td>
-         </tr>
-
-         [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-        </table>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-   <tr><td colspan="4"><hr size="3" noshade></td></tr>
-  </table>
-
-  <script type="text/javascript">
-   <!--
-       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-       //-->
-  </script>
-
-  <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>TOP100</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
new file mode 100644 (file)
index 0000000..a8ce648
--- /dev/null
@@ -0,0 +1,118 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body>
+
+ <form method="post" action="ic.pl">
+
+  <input type="hidden" name="title" value="[% 'Update prices' | $T8 %]">
+
+  <div class="listtop">[% 'Update prices' | $T8 %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
+     <td><input name="partnumber" size="20"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
+     <td colspan="3"><input name="description" size="20"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Group' | $T8 %]</th>
+     <td><input name="partsgroup" size="20"></td>
+     <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th>
+     <td><input name="serialnumber" size="20"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Make' | $T8 %]</th>
+     <td><input name="make" size="20"></td>
+     <th align="right" nowrap>[% 'Model' | $T8 %]</th>
+     <td><input name="model" size="20"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
+     <td><input name="drawing" size="20"></td>
+     <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
+     <td><input name="microfiche" size="20"></td>
+    </tr>
+
+    <tr>
+     <td></td>
+     <td colspan="3">
+      <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
+      <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
+      <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
+      <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
+      <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
+      <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
+      <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
+      <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
+      <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
+      <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <hr size="1" noshade>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+     <th class="listheading">[% 'Preis' | $T8 %]</th>
+     <th class="listheading">[% 'Prozentual/Absolut' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <td>[% 'Sell Price' | $T8 %]</td>
+     <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
+     <td align="center">
+      <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
+      <input name="sellprice_type" class="radio" type="radio" value="absolut">
+     </td>
+    </tr>
+
+    <tr>
+     <td>[% 'List Price' | $T8 %]</td>
+     <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
+     <td align="center">
+      <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
+      <input name="listprice_type" class="radio" type="radio" value="absolut">
+     </td>
+    </tr>
+
+    [%- FOREACH row = PRICE_ROWS %]
+    <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+
+    <tr>
+     <td><input type="hidden" name="pricegroup_[% loop.count %]" size="30"  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
+     <td><input name="price_[% loop.count %]" size="11"></td>
+     <td align="center">
+      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="percent" checked> /
+      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="absolut">
+     </td>
+    </tr>
+    [%- END %]
+
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <input type="hidden" name="nextsub" value="confirm_price_update">
+  <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
+
+  <p>
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/ic/search_update_prices_de.html b/templates/webpages/ic/search_update_prices_de.html
deleted file mode 100644 (file)
index 71251e1..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="title" value="Preise aktualisieren">
-
-  <div class="listtop">Preise aktualisieren</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Artikelnummer</th>
-     <td><input name="partnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
-     <td colspan="3"><input name="description" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Warengruppe</th>
-     <td><input name="partsgroup" size="20"></td>
-     <th align="right" nowrap>Seriennummer</th>
-     <td><input name="serialnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Lieferant</th>
-     <td><input name="make" size="20"></td>
-     <th align="right" nowrap>Lieferanten-Art-Nr.</th>
-     <td><input name="model" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Zeichnung</th>
-     <td><input name="drawing" size="20"></td>
-     <th align="right" nowrap>Mikrofilm</th>
-     <td><input name="microfiche" size="20"></td>
-    </tr>
-
-    <tr>
-     <td></td>
-     <td colspan="3">
-      <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-      <label for="itemstatus_active">Aktiv</label>
-      <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-      <label for="itemstatus_onhand">Auf Lager</label>
-      <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-      <label for="itemstatus_short">Knapp</label>
-      <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-      <label for="itemstatus_obsolete">Ungültig</label>
-      <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-      <label for="itemstatus_orphaned">Nie benutzt</label>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="1" noshade>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Preisgruppe</th>
-     <th class="listheading">Preis</th>
-     <th class="listheading">Prozentual/Absolut</th>
-    </tr>
-
-    <tr>
-     <td>Verkaufspreis</td>
-     <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
-     <td align="center">
-      <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="sellprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    <tr>
-     <td>Listenpreis</td>
-     <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
-     <td align="center">
-      <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="listprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    [%- FOREACH row = PRICE_ROWS %]
-    <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr>
-     <td><input type="hidden" name="pricegroup_[% loop.count %]" size="30"  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-     <td><input name="price_[% loop.count %]" size="11"></td>
-     <td align="center">
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="percent" checked> /
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="confirm_price_update">
-  <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/search_update_prices_en.html b/templates/webpages/ic/search_update_prices_en.html
deleted file mode 100644 (file)
index 344202a..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="title" value="Update prices">
-
-  <div class="listtop">Update prices</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Part Number</th>
-     <td><input name="partnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Part Description</th>
-     <td colspan="3"><input name="description" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Group</th>
-     <td><input name="partsgroup" size="20"></td>
-     <th align="right" nowrap>Serial Number</th>
-     <td><input name="serialnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Make</th>
-     <td><input name="make" size="20"></td>
-     <th align="right" nowrap>Model</th>
-     <td><input name="model" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Drawing</th>
-     <td><input name="drawing" size="20"></td>
-     <th align="right" nowrap>Microfiche</th>
-     <td><input name="microfiche" size="20"></td>
-    </tr>
-
-    <tr>
-     <td></td>
-     <td colspan="3">
-      <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-      <label for="itemstatus_active">Active</label>
-      <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-      <label for="itemstatus_onhand">On Hand</label>
-      <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-      <label for="itemstatus_short">Short</label>
-      <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-      <label for="itemstatus_obsolete">Obsolete</label>
-      <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-      <label for="itemstatus_orphaned">Orphaned</label>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="1" noshade>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Preisklasse</th>
-     <th class="listheading">Preis</th>
-     <th class="listheading">Prozentual/Absolut</th>
-    </tr>
-
-    <tr>
-     <td>Sell Price</td>
-     <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
-     <td align="center">
-      <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="sellprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    <tr>
-     <td>List Price</td>
-     <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
-     <td align="center">
-      <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="listprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    [%- FOREACH row = PRICE_ROWS %]
-    <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr>
-     <td><input type="hidden" name="pricegroup_[% loop.count %]" size="30"  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-     <td><input name="price_[% loop.count %]" size="11"></td>
-     <td align="center">
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="percent" checked> /
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="confirm_price_update">
-  <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ic/search_update_prices_master.html b/templates/webpages/ic/search_update_prices_master.html
deleted file mode 100644 (file)
index a64c4dd..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body>
-
- <form method="post" action="ic.pl">
-
-  <input type="hidden" name="title" value="<translate>Update prices</translate>">
-
-  <div class="listtop"><translate>Update prices</translate></div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
-     <td><input name="partnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
-     <td colspan="3"><input name="description" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Group</translate></th>
-     <td><input name="partsgroup" size="20"></td>
-     <th align="right" nowrap><translate>Serial Number</translate></th>
-     <td><input name="serialnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Make</translate></th>
-     <td><input name="make" size="20"></td>
-     <th align="right" nowrap><translate>Model</translate></th>
-     <td><input name="model" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Drawing</translate></th>
-     <td><input name="drawing" size="20"></td>
-     <th align="right" nowrap><translate>Microfiche</translate></th>
-     <td><input name="microfiche" size="20"></td>
-    </tr>
-
-    <tr>
-     <td></td>
-     <td colspan="3">
-      <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-      <label for="itemstatus_active"><translate>Active</translate></label>
-      <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-      <label for="itemstatus_onhand"><translate>On Hand</translate></label>
-      <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-      <label for="itemstatus_short"><translate>Short</translate></label>
-      <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-      <label for="itemstatus_obsolete"><translate>Obsolete</translate></label>
-      <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-      <label for="itemstatus_orphaned"><translate>Orphaned</translate></label>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="1" noshade>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Preisklasse</translate></th>
-     <th class="listheading"><translate>Preis</translate></th>
-     <th class="listheading"><translate>Prozentual/Absolut</translate></th>
-    </tr>
-
-    <tr>
-     <td><translate>Sell Price</translate></td>
-     <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
-     <td align="center">
-      <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="sellprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    <tr>
-     <td><translate>List Price</translate></td>
-     <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
-     <td align="center">
-      <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
-      <input name="listprice_type" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-
-    [%- FOREACH row = PRICE_ROWS %]
-    <input type="hidden" name="pricegroup_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-
-    <tr>
-     <td><input type="hidden" name="pricegroup_[% loop.count %]" size="30"  value="[% HTML.escape(row.pricegroup) %]">[% HTML.escape(row.pricegroup) %]</td>
-     <td><input name="price_[% loop.count %]" size="11"></td>
-     <td align="center">
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="percent" checked> /
-      <input name="pricegroup_type_[% loop.count %]" class="radio" type="radio" value="absolut">
-     </td>
-    </tr>
-    [%- END %]
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="confirm_price_update">
-  <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
new file mode 100644 (file)
index 0000000..179e65d
--- /dev/null
@@ -0,0 +1,88 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr class="listheading">
+[% IF is_type_credit_note %]
+      <th colspan="6" class="listheading">[% 'Payments' | $T8 %]</th>
+[% ELSE %]
+      <th colspan="6" class="listheading">[% 'Incoming Payments' | $T8 %]</th>
+[%- END %]
+     </tr>
+
+
+     <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Memo' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+[% IF show_exchangerate %]
+      <th>[% 'Exch' | $T8 %]</th>
+[% END %]
+      <th>[% 'Account' | $T8 %]</th>
+     </tr>
+
+
+[% 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 %]
+
+     <tr>
+
+    <td align="center">
+      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
+      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
+     </td>
+     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
+     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
+     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
+[% IF show_exchangerate %]
+     <td align="center">
+  [% SET forex        = 'forex_'        _ i %]
+  [% SET exchangerate = 'exchangerate_' _ i %]
+  [% IF forex %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
+        [% LxERP.format_amount(exchangerate, 2) %]
+  [% ELSE %]
+        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
+  [% END %]
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
+     </td>
+[% END %]
+     <td align="center"><select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select></td>
+
+    </tr>
+    <script type='text/javascript'>
+     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
+     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
+     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
+    </script>
+
+[% END # foreach %]
+
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">[% 'Total' | $T8 %]</td>
+      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">[% 'Missing amount' | $T8 %]</td>
+      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+    </tr>
+
+     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+     <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
+     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
+
+     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
+    </table>
+
+    </td>
+  </tr>
diff --git a/templates/webpages/ir/_payments_de.html b/templates/webpages/ir/_payments_de.html
deleted file mode 100644 (file)
index 4b5119f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">Zahlungsausgänge</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">Zahlungseingänge</th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th>Datum</th>
-      <th>Beleg</th>
-      <th>Memo</th>
-      <th>Betrag</th>
-[% IF show_exchangerate %]
-      <th>Wechselkurs.</th>
-[% END %]
-      <th>Konto</th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">Summe</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">Fehlbetrag</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/ir/_payments_en.html b/templates/webpages/ir/_payments_en.html
deleted file mode 100644 (file)
index ac88eeb..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">Payments</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">Incoming Payments</th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th>Date</th>
-      <th>Source</th>
-      <th>Memo</th>
-      <th>Amount</th>
-[% IF show_exchangerate %]
-      <th>Exch</th>
-[% END %]
-      <th>Account</th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">Total</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">Missing amount</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/ir/_payments_master.html b/templates/webpages/ir/_payments_master.html
deleted file mode 100644 (file)
index d2e6bf8..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading"><translate>Payments</translate></th>
-[% ELSE %]
-      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th><translate>Date</translate></th>
-      <th><translate>Source</translate></th>
-      <th><translate>Memo</translate></th>
-      <th><translate>Amount</translate></th>
-[% IF show_exchangerate %]
-      <th><translate>Exch</translate></th>
-[% END %]
-      <th><translate>Account</translate></th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center"><translate>Total</translate></td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center"><translate>Missing amount</translate></td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
new file mode 100644 (file)
index 0000000..9e75178
--- /dev/null
@@ -0,0 +1,132 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr valign="bottom">
+      <td>
+       <table>
+        <tr>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
+        </tr>
+        <tr valign="top">
+         <td>
+          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+         </td>
+         <td>
+          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+         </td>
+        </tr>
+[%- IF id && follow_ups.size %]
+        <tr>
+          <td colspan="2">
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
+          <td>
+        </tr>
+[%- END %]
+       </table>
+      </td>
+      <td align="right">
+  [%- IF taxaccounts %]
+       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+       <b>[% 'Tax Included' | $T8 %]</b>
+       <br>
+       <br>
+  [%- END %]
+       <table>
+
+[%- UNLESS taxincluded %]
+        <tr>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
+         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+       </tr>
+[%- END %]
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
+       <tr>
+        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
+       </tr>
+  [%- IF taxincluded %]
+       <tr>
+        <th align="right">Nettobetrag</th>
+        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
+       </tr>
+  [%- END %]
+[%- END %]
+
+        <tr>
+         <th align="right">[% 'Total' | $T8 %]</th>
+         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+        </tr>
+       </table>
+      </td>
+     </tr>
+    </table>
+   </td>
+  </tr>
+
+[% PROCESS 'webdav/_list.thml' %]
+
+[% PROCESS 'ir/_payments.html' %]
+
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+    <td>
+[% print_options %]
+    </td>
+  </tr>
+ </table>
+
+
+
+  [% IF id %]
+
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+[% IF  show_storno %]
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
+[% END %]
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
+
+[% IF show_delete %]
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+[% END %]
+
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
+
+ [% ELSE # no id %]
+   [% UNLESS locked %]
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+  [% END %]
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
+
+</form>
+
+</body>
+
+</html>
diff --git a/templates/webpages/ir/form_footer_de.html b/templates/webpages/ir/form_footer_de.html
deleted file mode 100644 (file)
index 9208ab4..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left">Bemerkungen</th>
-         <th align="left">interne Bemerkungen</th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Steuer im Preis inbegriffen</b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right">Zwischensumme</th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right">Summe</th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_de.html' %]
-
-[% PROCESS 'ir/_payments_de.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Erneuern">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
-[% END %]
-    <input class="submit" type="submit" name="action" value="Zahlung buchen">
-    <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
-
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Löschen">
-[% END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-      <input class="submit" type="submit" name="action" value="Buchen">
-      <input class="submit" type="submit" name="action" value="Entwurf speichern">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="Historie">
-
-      <input type="submit" class="submit" name="action" value="als bezahlt markieren">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
-
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/ir/form_footer_en.html b/templates/webpages/ir/form_footer_en.html
deleted file mode 100644 (file)
index 5f3700b..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left">Notes</th>
-         <th align="left">Internal Notes</th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('There are #1 unfinished follow-ups of which #2 are due.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Tax Included</b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right">Subtotal</th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right">Total</th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_master.html' %]
-
-[% PROCESS 'ir/_payments_master.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Update">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
-[% END %]
-    <input class="submit" type="submit" name="action" value="Post Payment">
-    <input class="submit" type="submit" name="action" value="Use As Template">
-
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Delete">
-[% END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="Follow-Up">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Update">
-      <input class="submit" type="submit" name="action" value="Post">
-      <input class="submit" type="submit" name="action" value="Save Draft">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="history">
-
-      <input type="submit" class="submit" name="action" value="mark as paid">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
-
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/ir/form_footer_master.html b/templates/webpages/ir/form_footer_master.html
deleted file mode 100644 (file)
index 2b4793a..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left"><translate>Notes</translate></th>
-         <th align="left"><translate>Internal Notes</translate></th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b><translate>Tax Included</translate></b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right"><translate>Subtotal</translate></th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right"><translate>Total</translate></th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
-
-[% PROCESS 'ir/_payments_<translate>master</translate>.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="<translate>Update</translate>">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="<translate>Storno</translate>">
-[% END %]
-    <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
-
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-[% END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Save Draft</translate>">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="<translate>history</translate>">
-
-      <input type="submit" class="submit" name="action" value="<translate>mark as paid</translate>">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
-
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
new file mode 100644 (file)
index 0000000..c0260e8
--- /dev/null
@@ -0,0 +1,233 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
+<body>
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/delivery_vendor_selection.js"></script>
+<script type="text/javascript" src="js/vendor_selection.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
+
+<form method="post" name="invoice" action="[% script %]">
+
+<p>[% saved_message %]</p>
+
+[%- FOREACH key = HIDDENS %]
+<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
+[%- END %]
+<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
+<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
+<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+<input type="hidden" name="follow_up_rowcount" value="1">
+
+<input type="hidden" name="lizenzen" value="[% lizenzen %]">
+
+<p><div class="listtop" width="100%">[% title %]</div></p>
+
+<table width="100%">
+  <tr>
+    <td valign="top">
+      <table>
+        <tr>
+          <th align="right">[% 'Vendor' | $T8 %]</th>
+          <td>
+            [%- 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();" -%]
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc | html %]')">
+          </td>
+          <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
+          <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
+          <input type="hidden" name="oldvendor" value="[% HTML.escape(oldvendor) %]">
+          <input type="hidden" name="selectvendor" value="[% HTML.escape(selectvendor) %]">
+        </tr>
+[%- IF ALL_CONTACTS.size %]
+        <tr>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'cp_id',
+                 style      = 'width: 250px',
+                 DATA       = ALL_CONTACTS,
+                 id_key     = 'cp_id',
+                 label_sub  = 'contact_labels',
+                 show_empty = 1 -%]
+          </td>
+        </tr>
+[%- END %]
+        <tr>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
+          <td>
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
+            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
+          </td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
+          <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
+          <input type="hidden" name="selectAP" value="[% selectAP %]">
+        </tr>
+        <tr>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'taxzone_id'
+                 style      = 'width: 250px'
+                 DATA       = ALL_TAXZONES
+                 id_key     = 'id'
+                 readonly   = (id ? 1 : 0)
+                 label_key  = 'description' -%]
+          </td>
+  [%- IF id %]
+          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
+  [%- END %]
+        </tr>
+[%- IF all_departments %]
+        <tr>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+          <td colspan="3">
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'department_id',
+                 style      = 'width: 250px',
+                 DATA       = all_departments,
+                 id_key     = 'id',
+                 label_sub  = 'department_labels',
+                 show_empty = 1 -%]
+          </td>
+        </tr>
+[%- END %]
+[%- IF currencies %]
+        <tr>
+          <th align="right">[% 'Currency' | $T8 %]</th>
+          <td>[% currencies %]</td>
+        </tr>
+[%- END %]
+        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
+        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+[%- IF show_exchangerate %]
+        <tr>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
+          <td>
+           [%- IF forex %]
+            [% LxERP.format_amount(exchangerate, 2) %]
+           [%- ELSE %]
+            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+           [%- END %]
+          </td>
+        </tr>
+[%- END %]
+      </table>
+    </td>
+    <td align="right" valign="top">
+      <table>
+        <tr>
+          <th align="right">[% 'Employee' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'employee_id',
+                 DATA       = ALL_EMPLOYEES,
+                 id_key     = 'id',
+                 label_sub  = 'sales_employee_labels' -%]
+          </td>
+        </tr>
+
+[%- IF is_type_credit_note %]
+        <tr>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
+          <td nowrap>
+            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+[%- ELSE %]
+        <tr>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
+          <td nowrap>
+            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
+          <td width="13">
+            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+[%- END %]
+
+        <tr>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
+          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
+          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
+          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
+           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
+          <td>
+            [%- 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();" -%]
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+    </td>
+  </tr>
+  <script type="text/javascript" src="js/show_form_details.js"></script>
+  <script type="text/javascript" src="js/show_vc_details.js"></script>
+  <script type="text/javascript" src="js/show_history.js"></script>
+  <script type="text/javascript">
+   <!--
+     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
+     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
+     $('document').ready(function(){
+[% IF creditwarning != '' %]
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
+[% ELSE %]
+       focus();
+[% END %]
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
+     });
+   //-->
+  </script>
+
+  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/ir/form_header_de.html b/templates/webpages/ir/form_header_de.html
deleted file mode 100644 (file)
index 47560d5..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_vendor_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-<p>[% saved_message %]</p>
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right">Lieferant</th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="D" onclick="show_vc_details('[% vc | html %]')">
-          </td>
-          <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
-          <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
-          <input type="hidden" name="oldvendor" value="[% HTML.escape(oldvendor) %]">
-          <input type="hidden" name="selectvendor" value="[% HTML.escape(selectvendor) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right">Ansprechpartner</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right">Kreditlimit</td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Rest
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Buchen auf</th>
-          <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
-          <input type="hidden" name="selectAP" value="[% selectAP %]">
-        </tr>
-        <tr>
-          <th align="right">Steuersatz</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 style      = 'width: 250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap>Abteilung</th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right">Währung</th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right">Wechselkurs</th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right">Bearbeiter</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap>Gutschriftnummer</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Gutschriftdatum</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap>Rechnungsnummer</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Rechnungsdatum</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
-          </td>
-        </tr>
-        <tr>
-          <th align="right">Fälligkeitsdatum</th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="?">
-          </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap>Auftragsnummer</th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Auftragsdatum</th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Angebotsdatum</th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Projektnummer</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF creditwarning != '' %]
-       alert('Kreditlimit überschritten!');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'Falsches Format');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/ir/form_header_en.html b/templates/webpages/ir/form_header_en.html
deleted file mode 100644 (file)
index 5e2c7ac..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_vendor_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-<p>[% saved_message %]</p>
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right">Vendor</th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% vc | html %]')">
-          </td>
-          <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
-          <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
-          <input type="hidden" name="oldvendor" value="[% HTML.escape(oldvendor) %]">
-          <input type="hidden" name="selectvendor" value="[% HTML.escape(selectvendor) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right">Contact Person</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right">Credit Limit</td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Remaining
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Record in</th>
-          <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
-          <input type="hidden" name="selectAP" value="[% selectAP %]">
-        </tr>
-        <tr>
-          <th align="right">Steuersatz</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 style      = 'width: 250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap>Department</th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right">Currency</th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right">Exchangerate</th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right">Employee</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap>Credit Note Number</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Credit Note Date</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="button">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap>Invoice Number</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Invoice Date</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="button">
-          </td>
-        </tr>
-        <tr>
-          <th align="right">Due Date</th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="button">
-          </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap>Order Number</th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Order Date</th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Quotation Date</th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Project Number</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF creditwarning != '' %]
-       alert('Credit Limit exceeded!!!');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'wrongformat');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/ir/form_header_master.html b/templates/webpages/ir/form_header_master.html
deleted file mode 100644 (file)
index 770fcaf..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_vendor_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-<p>[% saved_message %]</p>
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right"><translate>Vendor</translate></th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% vc | html %]')">
-          </td>
-          <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
-          <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
-          <input type="hidden" name="oldvendor" value="[% HTML.escape(oldvendor) %]">
-          <input type="hidden" name="selectvendor" value="[% HTML.escape(selectvendor) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right"><translate>Contact Person</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right"><translate>Credit Limit</translate></td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; <translate>Remaining</translate>
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Record in</translate></th>
-          <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
-          <input type="hidden" name="selectAP" value="[% selectAP %]">
-        </tr>
-        <tr>
-          <th align="right"><translate>Steuersatz</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 style      = 'width: 250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap><translate>Department</translate></th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right"><translate>Currency</translate></th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right"><translate>Exchangerate</translate></th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right"><translate>Employee</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap><translate>Credit Note Number</translate></th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Credit Note Date</translate></th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap><translate>Invoice Number</translate></th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Invoice Date</translate></th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
-          </td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Due Date</translate></th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="<translate>button</translate>">
-          </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap><translate>Order Number</translate></th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Order Date</translate></th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Quotation Date</translate></th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Project Number</translate></th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF creditwarning != '' %]
-       alert('<translate>Credit Limit exceeded!!!</translate>');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-       setupPoints('[% numberformat %]', '<translate>wrongformat</translate>');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
new file mode 100644 (file)
index 0000000..1c39b20
--- /dev/null
@@ -0,0 +1,87 @@
+[%- USE LxERP %][% USE T8 %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr class="listheading">
+[% IF is_type_credit_note %]
+      <th colspan="6" class="listheading">[%- 'Payments' | $T8 %]</th>
+[% ELSE %]
+      <th colspan="6" class="listheading">[%- 'Incoming Payments' | $T8 %]</th>
+[%- END %]
+     </tr>
+
+
+     <tr>
+      <th>[%- 'Date' | $T8 %]</th>
+      <th>[%- 'Source' | $T8 %]</th>
+      <th>[%- 'Memo' | $T8 %]</th>
+      <th>[%- 'Amount' | $T8 %]</th>
+[% IF show_exchangerate %]
+      <th>[%- 'Exch' | $T8 %]</th>
+[% END %]
+      <th>[%- 'Account' | $T8 %]</th>
+     </tr>
+
+
+[% 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 %]
+
+     <tr>
+
+    <td align="center">
+      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
+      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
+     </td>
+     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
+     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
+     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
+[% IF show_exchangerate %]
+     <td align="center">
+  [% SET forex        = 'forex_'        _ i %]
+  [% SET exchangerate = 'exchangerate_' _ i %]
+  [% IF forex %]
+        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
+        [% LxERP.format_amount(exchangerate, 2) %]
+  [% ELSE %]
+        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
+  [% END %]
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
+     </td>
+[% END %]
+     <td align="center"><select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select></td>
+
+    </tr>
+    <script type='text/javascript'>
+     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
+     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
+     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
+    </script>
+
+[% END # foreach %]
+
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">[%- 'Total' | $T8 %]</td>
+      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">[%- 'Missing amount' | $T8 %]</td>
+      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+    </tr>
+
+     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
+     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
+
+     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
+    </table>
+
+    </td>
+  </tr>
diff --git a/templates/webpages/is/_payments_de.html b/templates/webpages/is/_payments_de.html
deleted file mode 100644 (file)
index 1c39b20..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %][% USE T8 %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">[%- 'Payments' | $T8 %]</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">[%- 'Incoming Payments' | $T8 %]</th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th>[%- 'Date' | $T8 %]</th>
-      <th>[%- 'Source' | $T8 %]</th>
-      <th>[%- 'Memo' | $T8 %]</th>
-      <th>[%- 'Amount' | $T8 %]</th>
-[% IF show_exchangerate %]
-      <th>[%- 'Exch' | $T8 %]</th>
-[% END %]
-      <th>[%- 'Account' | $T8 %]</th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Missing amount' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/is/_payments_en.html b/templates/webpages/is/_payments_en.html
deleted file mode 100644 (file)
index 1c39b20..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %][% USE T8 %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">[%- 'Payments' | $T8 %]</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">[%- 'Incoming Payments' | $T8 %]</th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th>[%- 'Date' | $T8 %]</th>
-      <th>[%- 'Source' | $T8 %]</th>
-      <th>[%- 'Memo' | $T8 %]</th>
-      <th>[%- 'Amount' | $T8 %]</th>
-[% IF show_exchangerate %]
-      <th>[%- 'Exch' | $T8 %]</th>
-[% END %]
-      <th>[%- 'Account' | $T8 %]</th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Missing amount' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/is/_payments_master.html b/templates/webpages/is/_payments_master.html
deleted file mode 100644 (file)
index 1c39b20..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- USE LxERP %][% USE T8 %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">[%- 'Payments' | $T8 %]</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">[%- 'Incoming Payments' | $T8 %]</th>
-[%- END %]
-     </tr>
-
-
-     <tr>
-      <th>[%- 'Date' | $T8 %]</th>
-      <th>[%- 'Source' | $T8 %]</th>
-      <th>[%- 'Memo' | $T8 %]</th>
-      <th>[%- 'Amount' | $T8 %]</th>
-[% IF show_exchangerate %]
-      <th>[%- 'Exch' | $T8 %]</th>
-[% END %]
-      <th>[%- 'Account' | $T8 %]</th>
-     </tr>
-
-
-[% 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 %]
-
-     <tr>
-
-    <td align="center">
-      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="[% dateformat %]" value="[% $datepaid %]">
-      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
-     </td>
-     <td align=center><input name="source_[% i %]" size="11" value="[% $source %]"></td>
-     <td align="center"><input name="memo_[% i %]" size="11" value="[% $memo %]"></td>
-     <td align="center"><input name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]"></td>
-[% IF show_exchangerate %]
-     <td align="center">
-  [% SET forex        = 'forex_'        _ i %]
-  [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
-        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
-  [% ELSE %]
-        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
-  [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
-     </td>
-[% END %]
-     <td align="center"><select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select></td>
-
-    </tr>
-    <script type='text/javascript'>
-     Calendar.setup({ inputField : "datepaid_[% i %]", ifFormat :"[% myconfig_jsc_dateformat %]", align : "TR", button : "trigger_datepaid_[% i %]" });
-     $('input[name="paid_[% i %]"]').blur(function(){ check_right_number_format(this) });
-     $('#datepaid_[% i %]').blur(function(){ check_right_date_format(this) });
-    </script>
-
-[% END # foreach %]
-
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">[%- 'Missing amount' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
-    </tr>
-
-     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
-     <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
-     <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
-
-     <input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
-    </table>
-
-    </td>
-  </tr>
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
new file mode 100644 (file)
index 0000000..314e65a
--- /dev/null
@@ -0,0 +1,175 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr valign="bottom">
+      <td>
+       <table>
+        <tr>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
+         <th align="right">[% 'Payment Terms' | $T8 %]</th>
+        </tr>
+        <tr valign="top">
+         <td>
+          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+         </td>
+         <td>
+          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+         </td>
+         <td>
+            [%- 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 -%]
+          <script type='text/javascript'>$('#payment_id').change(function(){
+            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
+          </script>
+         </td>
+        </tr>
+[%- IF id && follow_ups.size %]
+        <tr>
+          <td colspan="2">
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
+          <td>
+        </tr>
+[%- END %]
+       </table>
+      </td>
+      <td>
+       <table>
+        <tr>
+         <th  align=left>[% 'Ertrag' | $T8 %]</th>
+         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
+        </tr>
+        <tr>
+         <th  align=left>[% 'Ertrag prozentual' | $T8 %]</th>
+         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
+        </tr>
+        <input type=hidden name="marge_total" value="[% marge_total %]">
+        <input type=hidden name="marge_percent" value="[% marge_percent %]">
+       </table>
+      </td>
+      <td align="right">
+  [%- IF taxaccounts %]
+       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+       <b>[% 'Tax Included' | $T8 %]</b>
+       <br>
+       <br>
+  [%- END %]
+       <table>
+
+[%- UNLESS taxincluded %]
+        <tr>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
+         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+       </tr>
+[%- END %]
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
+       <tr>
+        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
+       </tr>
+  [%- IF taxincluded %]
+       <tr>
+        <th align="right">Nettobetrag</th>
+        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
+       </tr>
+  [%- END %]
+[%- END %]
+
+        <tr>
+         <th align="right">[% 'Total' | $T8 %]</th>
+         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+        </tr>
+       </table>
+      </td>
+     </tr>
+    </table>
+   </td>
+  </tr>
+
+[% PROCESS 'webdav/_list.html' %]
+
+[% PROCESS 'is/_payments.html' %]
+
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+    <td>
+[% print_options %]
+    </td>
+  </tr>
+ </table>
+
+
+
+  [% IF id %]
+
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+[% IF  show_storno %]
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
+[% END %]
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
+
+[% IF id && !is_type_credit_note %]
+    <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
+[% END %]
+[% IF show_delete %]
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+[% END %]
+
+  [%- UNLESS locked %]
+       <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
+  [%- END %]
+
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
+
+ [% ELSE # no id %]
+   [% UNLESS locked %]
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Preview' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Print and Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+  [% END %]
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+<input type="hidden" name="gldate" value="[% gldate %]">
+</form>
+
+</body>
+
+</html>
diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html
deleted file mode 100644 (file)
index a6c9cd0..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left">Bemerkungen</th>
-         <th align="left">interne Bemerkungen</th>
-         <th align="right">Zahlungskonditionen</th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-         <td>
-            [%- 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 -%]
-          <script type='text/javascript'>$('#payment_id').change(function(){
-            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
-          </script>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td>
-       <table>
-        <tr>
-         <th  align=left>Ertrag</th>
-         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
-        </tr>
-        <tr>
-         <th  align=left>Ertrag prozentual</th>
-         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
-        </tr>
-        <input type=hidden name="marge_total" value="[% marge_total %]">
-        <input type=hidden name="marge_percent" value="[% marge_percent %]">
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Steuer im Preis inbegriffen</b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right">Zwischensumme</th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right">Summe</th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_de.html' %]
-
-[% PROCESS 'is/_payments_de.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Erneuern">
-    <input class="submit" type="submit" name="action" value="Lieferadresse">
-    <input class="submit" type="submit" name="action" value="Drucken">
-    <input class="submit" type="submit" name="action" value="eMail">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
-[% END %]
-    <input class="submit" type="submit" name="action" value="Zahlung buchen">
-    <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
-
-[% IF id && !is_type_credit_note %]
-    <input class="submit" type="submit" name="action" value="Gutschrift">
-[% END %]
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Löschen">
-    <input class="submit" type="submit" name="action" value="Buchen">
-[% END %]
-
-  [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="Auftrag">
-  [%- END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-      <input class="submit" type="submit" name="action" value="Lieferadresse">
-      <input class="submit" type="submit" name="action" value="Druckvorschau">
-      <input class="submit" type="submit" name="action" value="eMail">
-      <input class="submit" type="submit" name="action" value="Drucken und Buchen">
-      <input class="submit" type="submit" name="action" value="Buchen">
-      <input class="submit" type="submit" name="action" value="Entwurf speichern">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="Historie">
-
-      <input type="submit" class="submit" name="action" value="als bezahlt markieren">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="customer_discount" value="[% customer_discount %]">
-<input type="hidden" name="gldate" value="[% gldate %]">
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/is/form_footer_en.html b/templates/webpages/is/form_footer_en.html
deleted file mode 100644 (file)
index 6b61142..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left">Notes</th>
-         <th align="left">Internal Notes</th>
-         <th align="right">Payment Terms</th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-         <td>
-            [%- 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 -%]
-          <script type='text/javascript'>$('#payment_id').change(function(){
-            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
-          </script>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('There are #1 unfinished follow-ups of which #2 are due.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td>
-       <table>
-        <tr>
-         <th  align=left>Ertrag</th>
-         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
-        </tr>
-        <tr>
-         <th  align=left>Ertrag prozentual</th>
-         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
-        </tr>
-        <input type=hidden name="marge_total" value="[% marge_total %]">
-        <input type=hidden name="marge_percent" value="[% marge_percent %]">
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Tax Included</b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right">Subtotal</th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right">Total</th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_master.html' %]
-
-[% PROCESS 'is/_payments_master.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Update">
-    <input class="submit" type="submit" name="action" value="Ship to">
-    <input class="submit" type="submit" name="action" value="Print">
-    <input class="submit" type="submit" name="action" value="E-mail">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
-[% END %]
-    <input class="submit" type="submit" name="action" value="Post Payment">
-    <input class="submit" type="submit" name="action" value="Use As Template">
-
-[% IF id && !is_type_credit_note %]
-    <input class="submit" type="submit" name="action" value="Credit Note">
-[% END %]
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Delete">
-    <input class="submit" type="submit" name="action" value="Post">
-[% END %]
-
-  [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="Order">
-  [%- END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="Follow-Up">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Update">
-      <input class="submit" type="submit" name="action" value="Ship to">
-      <input class="submit" type="submit" name="action" value="Preview">
-      <input class="submit" type="submit" name="action" value="E-mail">
-      <input class="submit" type="submit" name="action" value="Print and Post">
-      <input class="submit" type="submit" name="action" value="Post">
-      <input class="submit" type="submit" name="action" value="Save Draft">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="history">
-
-      <input type="submit" class="submit" name="action" value="mark as paid">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="customer_discount" value="[% customer_discount %]">
-<input type="hidden" name="gldate" value="[% gldate %]">
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
deleted file mode 100644 (file)
index 128618d..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-   <td>
-    <table width="100%">
-     <tr valign="bottom">
-      <td>
-       <table>
-        <tr>
-         <th align="left"><translate>Notes</translate></th>
-         <th align="left"><translate>Internal Notes</translate></th>
-         <th align="right"><translate>Payment Terms</translate></th>
-        </tr>
-        <tr valign="top">
-         <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
-         </td>
-         <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
-         </td>
-         <td>
-            [%- 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 -%]
-          <script type='text/javascript'>$('#payment_id').change(function(){
-            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
-          </script>
-         </td>
-        </tr>
-[%- IF id && follow_ups.size %]
-        <tr>
-          <td colspan="2">
-            [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
-          <td>
-        </tr>
-[%- END %]
-       </table>
-      </td>
-      <td>
-       <table>
-        <tr>
-         <th  align=left><translate>Ertrag</translate></th>
-         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
-        </tr>
-        <tr>
-         <th  align=left><translate>Ertrag prozentual</translate></th>
-         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
-        </tr>
-        <input type=hidden name="marge_total" value="[% marge_total %]">
-        <input type=hidden name="marge_percent" value="[% marge_percent %]">
-       </table>
-      </td>
-      <td align="right">
-  [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b><translate>Tax Included</translate></b>
-       <br>
-       <br>
-  [%- END %]
-       <table>
-
-[%- UNLESS taxincluded %]
-        <tr>
-         <th align="right"><translate>Subtotal</translate></th>
-         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
-       </tr>
-[%- END %]
-
-[%# tax %]
-[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ '_description' %]
-[% SET rate_ref        = item _ '_rate' %]
-[% SET total_ref       = item _ '_total' %]
-[% SET netto_ref       = item _ '_netto' %]
-       <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
-       </tr>
-  [%- IF taxincluded %]
-       <tr>
-        <th align="right">Nettobetrag</th>
-        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
-       </tr>
-  [%- END %]
-[%- END %]
-
-        <tr>
-         <th align="right"><translate>Total</translate></th>
-         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
-
-[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
-
-[% PROCESS 'is/_payments_<translate>master</translate>.html' %]
-
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
- </table>
-
-
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="<translate>Update</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="<translate>Storno</translate>">
-[% END %]
-    <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
-
-[% IF id && !is_type_credit_note %]
-    <input class="submit" type="submit" name="action" value="<translate>Credit Note</translate>">
-[% END %]
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
-[% END %]
-
-  [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
-  [%- END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Preview</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Print and Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Save Draft</translate>">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="<translate>history</translate>">
-
-      <input type="submit" class="submit" name="action" value="<translate>mark as paid</translate>">
-  [% END %]
-
-<input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
-<input type="hidden" name="customer_discount" value="[% customer_discount %]">
-<input type="hidden" name="gldate" value="[% gldate %]">
-</form>
-
-</body>
-
-</html>
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
new file mode 100644 (file)
index 0000000..919f37b
--- /dev/null
@@ -0,0 +1,315 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
+<body>
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+<script type="text/javascript" src="js/vendor_selection.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
+
+<form method="post" name="invoice" action="[% script %]">
+
+[%- FOREACH key = HIDDENS %]
+<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
+[%- END %]
+<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
+<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
+<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+<input type="hidden" name="follow_up_rowcount" value="1">
+
+<input type="hidden" name="lizenzen" value="[% lizenzen %]">
+
+<p><div class="listtop" width="100%">[% title %]</div></p>
+
+<p>[% saved_message %]</p>
+
+<table width="100%">
+  <tr>
+    <td valign="top">
+      <table>
+        <tr>
+          <th align="right">[% 'Customer' | $T8 %]</th>
+          <td>
+            [%- 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();" -%]
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+          </td>
+          <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
+          <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
+          <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
+          <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
+        </tr>
+[%- IF ALL_CONTACTS.size %]
+        <tr>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'cp_id',
+                 style      = 'width: 250px',
+                 DATA       = ALL_CONTACTS,
+                 id_key     = 'cp_id',
+                 label_sub  = 'contact_labels',
+                 show_empty = 1 -%]
+          </td>
+        </tr>
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+        <tr>
+          <th align="right">[% 'Shipping Address' | $T8 %]</th>
+          <td>
+            [%- 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();" -%]
+          </td>
+        </tr>
+[%- END %]
+        <tr>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
+          <td>
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
+            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
+          </td>
+        </tr>
+[%- IF max_dunning_level %]
+        <tr>
+          <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
+          <td>
+            <b>[% max_dunning_level %]</b>; [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
+          </td>
+        </tr>
+[%- END %]
+[%- IF business %]
+        <tr>
+          <th align="right">[% 'Customer type' | $T8 %]</th>
+          <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
+        </tr>
+[%- END %]
+        <tr>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
+          <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
+          <input type="hidden" name="selectAR" value="[% selectAR %]">
+        </tr>
+        <tr>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'taxzone_id'
+                 stype      = '250px'
+                 DATA       = ALL_TAXZONES
+                 id_key     = 'id'
+                 readonly   = (id ? 1 : 0)
+                 label_key  = 'description' -%]
+          </td>
+  [%- IF id %]
+          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
+  [%- END %]
+        </tr>
+[%- IF all_departments %]
+        <tr>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+          <td colspan="3">
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'department_id',
+                 style      = 'width: 250px',
+                 DATA       = all_departments,
+                 id_key     = 'id',
+                 label_sub  = 'department_labels',
+                 show_empty = 1 -%]
+          </td>
+        </tr>
+[%- END %]
+[%- IF currencies %]
+        <tr>
+          <th align="right">[% 'Currency' | $T8 %]</th>
+          <td>[% currencies %]</td>
+        </tr>
+[%- END %]
+        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
+        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+[%- IF show_exchangerate %]
+        <tr>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
+          <td>
+           [%- IF forex %]
+            [% LxERP.format_amount(exchangerate, 2) %]
+           [%- ELSE %]
+            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+           [%- END %]
+          </td>
+        </tr>
+[%- END %]
+        <tr>
+          <th align="right" nowrap>[% 'Shipping Point' | $T8 %]</th>
+          <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Ship via' | $T8 %]</th>
+          <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Transaction description' | $T8 %]</th>
+          <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
+        </tr>
+      </table>
+    </td>
+    <td align="right" valign="top">
+      <table>
+        <tr>
+          <th align="right">[% 'Employee' | $T8 %]</th>
+          <td>
+            [%- INCLUDE 'generic/multibox.html'
+                 name       = 'employee_id',
+                 DATA       = ALL_EMPLOYEES,
+                 id_key     = 'id',
+                 label_sub  = 'sales_employee_labels' -%]
+          </td>
+        </tr>
+[%- IF ALL_SALESMEN.size %]
+        <tr>
+          <th align="right">[% 'Salesman' | $T8 %]</th>
+          <td>
+            [%- 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' -%]
+          </td>
+        </tr>
+[%- END %]
+
+[%- IF is_type_credit_note %]
+        <tr>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
+          <td nowrap>
+            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+[%- ELSE %]
+        <tr>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
+          <td nowrap>
+            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
+          <td width="13">
+            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
+          </td>
+        </tr>
+        <tr>
+        <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right">[% 'Delivery Date' | $T8 %]</th>
+            <td width="13">
+              <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
+              <input type="button" name="deliverydate_button" id="trigger3" value="[% 'button' | $T8 %]">
+            </td>
+        </tr>
+[%- END %]
+
+        <tr>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
+          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
+          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
+          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
+           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
+          <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
+          <td>
+            [%- 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();" -%]
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+    </td>
+  </tr>
+  <script type="text/javascript" src="js/show_form_details.js"></script>
+  <script type="text/javascript" src="js/show_vc_details.js"></script>
+  <script type="text/javascript" src="js/show_history.js"></script>
+  <script type="text/javascript">
+   <!--
+     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+[% IF !is_type_credit_note %]
+     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+     Calendar.setup({ inputField : "deliverydate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
+[% END %]
+     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
+     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
+     $('document').ready(function(){
+[% IF resubmit && is_format_html %]
+       window.open('about:blank','Beleg');
+       document.invoice.target = 'Beleg';
+       document.invoice.submit();
+[% ELSIF resubmit %]
+       document.invoice.submit();
+[% ELSIF creditwarning != '' %]
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
+[% ELSE %]
+       focus();
+[% END %]
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
+     });
+   //-->
+  </script>
+
+  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/is/form_header_de.html b/templates/webpages/is/form_header_de.html
deleted file mode 100644 (file)
index 692dadd..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<p>[% saved_message %]</p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right">Kunde</th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-          </td>
-          <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-          <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
-          <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
-          <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right">Ansprechpartner</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-        <tr>
-          <th align="right">Lieferadresse</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right">Kreditlimit</td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Rest
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-[%- IF max_dunning_level %]
-        <tr>
-          <th align="right">höchste Mahnstufe:</th>
-          <td>
-            <b>[% max_dunning_level %]</b>; gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
-          </td>
-        </tr>
-[%- END %]
-[%- IF business %]
-        <tr>
-          <th align="right">Kundentyp</th>
-          <td>[% business %]; Rabatt [% LxERP.format_amount(tradediscount * 100) %] %</td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap>Buchen auf</th>
-          <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
-          <input type="hidden" name="selectAR" value="[% selectAR %]">
-        </tr>
-        <tr>
-          <th align="right">Steuersatz</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 stype      = '250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap>Abteilung</th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right">Währung</th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right">Wechselkurs</th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap>Versandort</th>
-          <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Transportmittel</th>
-          <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Vorgangsbezeichnung</th>
-          <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
-        </tr>
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right">Bearbeiter</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-[%- IF ALL_SALESMEN.size %]
-        <tr>
-          <th align="right">Verkäufer/in</th>
-          <td>
-            [%- 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' -%]
-          </td>
-        </tr>
-[%- END %]
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap>Gutschriftnummer</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Gutschriftdatum</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap>Rechnungsnummer</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Rechnungsdatum</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
-          </td>
-        </tr>
-        <tr>
-          <th align="right">Fälligkeitsdatum</th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="?">
-          </td>
-        </tr>
-        <tr>
-        <th align="right" nowrap>Lieferscheinnummer</th>
-          <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Lieferdatum</th>
-            <td width="13">
-              <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
-              <input type="button" name="deliverydate_button" id="trigger3" value="?">
-            </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap>Auftragsnummer</th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Auftragsdatum</th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Angebotsnummer</th>
-          <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Angebotsdatum</th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Bestellnummer des Kunden</th>
-          <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Projektnummer</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-[% IF !is_type_credit_note %]
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "deliverydate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-[% END %]
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF resubmit && is_format_html %]
-       window.open('about:blank','Beleg');
-       document.invoice.target = 'Beleg';
-       document.invoice.submit();
-[% ELSIF resubmit %]
-       document.invoice.submit();
-[% ELSIF creditwarning != '' %]
-       alert('Kreditlimit überschritten!');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'Falsches Format');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/is/form_header_en.html b/templates/webpages/is/form_header_en.html
deleted file mode 100644 (file)
index 489c529..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-<p>[% saved_message %]</p>
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right">Customer</th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-          </td>
-          <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-          <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
-          <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
-          <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right">Contact Person</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-        <tr>
-          <th align="right">Shipping Address</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right">Credit Limit</td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Remaining
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-[%- IF max_dunning_level %]
-        <tr>
-          <th align="right">Max. Dunning Level:</th>
-          <td>
-            <b>[% max_dunning_level %]</b>; Dunning Amount: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
-          </td>
-        </tr>
-[%- END %]
-[%- IF business %]
-        <tr>
-          <th align="right">Customer type</th>
-          <td>[% business %]; Trade Discount [% LxERP.format_amount(tradediscount * 100) %] %</td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap>Record in</th>
-          <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
-          <input type="hidden" name="selectAR" value="[% selectAR %]">
-        </tr>
-        <tr>
-          <th align="right">Steuersatz</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 stype      = '250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap>Department</th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right">Currency</th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right">Exchangerate</th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap>Shipping Point</th>
-          <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Ship via</th>
-          <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Transaction description</th>
-          <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
-        </tr>
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right">Employee</th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-[%- IF ALL_SALESMEN.size %]
-        <tr>
-          <th align="right">Salesman</th>
-          <td>
-            [%- 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' -%]
-          </td>
-        </tr>
-[%- END %]
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap>Credit Note Number</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Credit Note Date</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="button">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap>Invoice Number</th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Invoice Date</th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="button">
-          </td>
-        </tr>
-        <tr>
-          <th align="right">Due Date</th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="button">
-          </td>
-        </tr>
-        <tr>
-        <th align="right" nowrap>Delivery Order Number</th>
-          <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right">Delivery Date</th>
-            <td width="13">
-              <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
-              <input type="button" name="deliverydate_button" id="trigger3" value="button">
-            </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap>Order Number</th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Order Date</th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Quotation Number</th>
-          <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Quotation Date</th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Customer Order Number</th>
-          <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>Project Number</th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-[% IF !is_type_credit_note %]
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "deliverydate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-[% END %]
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF resubmit && is_format_html %]
-       window.open('about:blank','Beleg');
-       document.invoice.target = 'Beleg';
-       document.invoice.submit();
-[% ELSIF resubmit %]
-       document.invoice.submit();
-[% ELSIF creditwarning != '' %]
-       alert('Credit Limit exceeded!!!');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'wrongformat');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/is/form_header_master.html b/templates/webpages/is/form_header_master.html
deleted file mode 100644 (file)
index aa41c08..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
-<body>
-<script type="text/javascript" src="js/common.js"></script>
-<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-<script type="text/javascript" src="js/vendor_selection.js"></script>
-<script type="text/javascript" src="js/calculate_qty.js"></script>
-<script type="text/javascript" src="js/follow_up.js"></script>
-<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-
-<form method="post" name="invoice" action="[% script %]">
-
-[%- FOREACH key = HIDDENS %]
-<input type="hidden" name="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
-[%- END %]
-<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
-<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
-<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-<input type="hidden" name="follow_up_rowcount" value="1">
-
-<input type="hidden" name="lizenzen" value="[% lizenzen %]">
-
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
-<p>[% saved_message %]</p>
-
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr>
-          <th align="right"><translate>Customer</translate></th>
-          <td>
-            [%- 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();" -%]
-            <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-          </td>
-          <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
-          <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
-          <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
-          <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
-        </tr>
-[%- IF ALL_CONTACTS.size %]
-        <tr>
-          <th align="right"><translate>Contact Person</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'cp_id',
-                 style      = 'width: 250px',
-                 DATA       = ALL_CONTACTS,
-                 id_key     = 'cp_id',
-                 label_sub  = 'contact_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-        <tr>
-          <th align="right"><translate>Shipping Address</translate></th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td align="right"><translate>Credit Limit</translate></td>
-          <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; <translate>Remaining</translate>
-            <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
-          </td>
-        </tr>
-[%- IF max_dunning_level %]
-        <tr>
-          <th align="right"><translate>Max. Dunning Level</translate>:</th>
-          <td>
-            <b>[% max_dunning_level %]</b>; <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
-          </td>
-        </tr>
-[%- END %]
-[%- IF business %]
-        <tr>
-          <th align="right"><translate>Customer type</translate></th>
-          <td>[% business %]; <translate>Trade Discount</translate> [% LxERP.format_amount(tradediscount * 100) %] %</td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap><translate>Record in</translate></th>
-          <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
-          <input type="hidden" name="selectAR" value="[% selectAR %]">
-        </tr>
-        <tr>
-          <th align="right"><translate>Steuersatz</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'taxzone_id'
-                 stype      = '250px'
-                 DATA       = ALL_TAXZONES
-                 id_key     = 'id'
-                 readonly   = (id ? 1 : 0)
-                 label_key  = 'description' -%]
-          </td>
-  [%- IF id %]
-          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
-  [%- END %]
-        </tr>
-[%- IF all_departments %]
-        <tr>
-          <th align="right" nowrap><translate>Department</translate></th>
-          <td colspan="3">
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'department_id',
-                 style      = 'width: 250px',
-                 DATA       = all_departments,
-                 id_key     = 'id',
-                 label_sub  = 'department_labels',
-                 show_empty = 1 -%]
-          </td>
-        </tr>
-[%- END %]
-[%- IF currencies %]
-        <tr>
-          <th align="right"><translate>Currency</translate></th>
-          <td>[% currencies %]</td>
-        </tr>
-[%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
-[%- IF show_exchangerate %]
-        <tr>
-          <th align="right"><translate>Exchangerate</translate></th>
-          <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 2) %]
-           [%- ELSE %]
-            <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-           [%- END %]
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align="right" nowrap><translate>Shipping Point</translate></th>
-          <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Ship via</translate></th>
-          <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Transaction description</translate></th>
-          <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
-        </tr>
-      </table>
-    </td>
-    <td align="right" valign="top">
-      <table>
-        <tr>
-          <th align="right"><translate>Employee</translate></th>
-          <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name       = 'employee_id',
-                 DATA       = ALL_EMPLOYEES,
-                 id_key     = 'id',
-                 label_sub  = 'sales_employee_labels' -%]
-          </td>
-        </tr>
-[%- IF ALL_SALESMEN.size %]
-        <tr>
-          <th align="right"><translate>Salesman</translate></th>
-          <td>
-            [%- 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' -%]
-          </td>
-        </tr>
-[%- END %]
-
-[%- IF is_type_credit_note %]
-        <tr>
-          <th align="right" nowrap><translate>Credit Note Number</translate></th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Credit Note Date</translate></th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
-          </td>
-        </tr>
-[%- ELSE %]
-        <tr>
-          <th align="right" nowrap><translate>Invoice Number</translate></th>
-          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Invoice Date</translate></th>
-          <td nowrap>
-            <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
-          </td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Due Date</translate></th>
-          <td width="13">
-            <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="<translate>button</translate>">
-          </td>
-        </tr>
-        <tr>
-        <th align="right" nowrap><translate>Delivery Order Number</translate></th>
-          <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right"><translate>Delivery Date</translate></th>
-            <td width="13">
-              <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
-              <input type="button" name="deliverydate_button" id="trigger3" value="<translate>button</translate>">
-            </td>
-        </tr>
-[%- END %]
-
-        <tr>
-          <th align="right" nowrap><translate>Order Number</translate></th>
-          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Order Date</translate></th>
-          <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
-          <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Quotation Number</translate></th>
-          <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Quotation Date</translate></th>
-          <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
-           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Customer Order Number</translate></th>
-          <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap><translate>Project Number</translate></th>
-          <td>
-            [%- 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();" -%]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-  </tr>
-  <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
-  <script type="text/javascript" src="js/show_history.js"></script>
-  <script type="text/javascript">
-   <!--
-     Calendar.setup({ inputField : "invdate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-[% IF !is_type_credit_note %]
-     Calendar.setup({ inputField : "duedate",      ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     Calendar.setup({ inputField : "deliverydate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-[% END %]
-     Calendar.setup({ inputField : "orddate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_orddate" });
-     Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
-     $('document').ready(function(){
-[% IF resubmit && is_format_html %]
-       window.open('about:blank','Beleg');
-       document.invoice.target = 'Beleg';
-       document.invoice.submit();
-[% ELSIF resubmit %]
-       document.invoice.submit();
-[% ELSIF creditwarning != '' %]
-       alert('<translate>Credit Limit exceeded!!!</translate>');
-[% ELSE %]
-       focus();
-[% END %]
-       setupDateFormat('[% dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-       setupPoints('[% numberformat %]', '<translate>wrongformat</translate>');
-     });
-   //-->
-  </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
diff --git a/templates/webpages/login/auth_db_unreachable.html b/templates/webpages/login/auth_db_unreachable.html
new file mode 100644 (file)
index 0000000..bc3e11b
--- /dev/null
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+<body>
+
+ <p><b>[% 'Error!' | $T8 %]</b></p>
+
+ <p>[%- 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
+
+ <p>[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]</p>
+
+ <p>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/login/auth_db_unreachable_de.html b/templates/webpages/login/auth_db_unreachable_de.html
deleted file mode 100644 (file)
index a30e4c9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<body>
-
- <p><b>Fehler!</b></p>
-
- <p>Die Authentifizierungsdatenbank kann momentan nicht erreicht werden. Entweder wurde sie noch nicht eingerichtet, oder der Datenbankserver antwortet nicht. Bitte wenden Sie sich an Ihren Administrator.</p>
-
- <p>Wenn Sie die Authentifizierungsdatenbank selber einrichten wollen, so melden Sie sich an der Administrationsoberfl&auml;che an. Lx-Office wird dann die Datenbank und die Tabellen f&uuml;r Sie anlegen.</p>
-
- <p>
-  <a href="login.pl" target="_top">Anmeldung</a> |
-  <a href="admin.pl" target="_top">Administration</a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/auth_db_unreachable_en.html b/templates/webpages/login/auth_db_unreachable_en.html
deleted file mode 100644 (file)
index 7ab3289..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<body>
-
- <p><b>Error!</b></p>
-
- <p>The authentication database is not reachable at the moment. Either it hasn't been set up yet or the database server might be down. Please contact your administrator.</p>
-
- <p>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.</p>
-
- <p>
-  <a href="login.pl" target="_top">Login</a> |
-  <a href="admin.pl" target="_top">Administration</a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/auth_db_unreachable_master.html b/templates/webpages/login/auth_db_unreachable_master.html
deleted file mode 100644 (file)
index c2cbb82..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<body>
-
- <p><b><translate>Error!</translate></b></p>
-
- <p><translate>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.</translate></p>
-
- <p><translate>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.</translate></p>
-
- <p>
-  <a href="login.pl" target="_top"><translate>Login</translate></a> |
-  <a href="admin.pl" target="_top"><translate>Administration</translate></a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/authentication_pl_missing.html b/templates/webpages/login/authentication_pl_missing.html
new file mode 100644 (file)
index 0000000..e9530b0
--- /dev/null
@@ -0,0 +1,16 @@
+[%- USE T8 %]
+<body>
+
+ <p><b>[% 'Error!' | $T8 %]</b></p>
+
+ <p>[% 'The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]</p>
+
+ <p>[% 'If you yourself want to upgrade the installation then please read the file &quot;doc/UPGRADE&quot; and follow the steps outlined in this file.' | $T8 %]</p>
+
+ <p>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/login/authentication_pl_missing_de.html b/templates/webpages/login/authentication_pl_missing_de.html
deleted file mode 100644 (file)
index 08ee779..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<body>
-
- <p><b>Fehler!</b></p>
-
- <p>Die Konfigurationsdatei f&uuml;r die Authentifizierung &quot;config/authentication.pl&quot; wurde nicht gefunden. Diese Lx-Office-Installation wurde vermutlich noch nicht vollst&auml;ndig aktualisiert oder eingerichtet. Bitte wenden Sie sich an Ihren Administrator.</p>
-
- <p>Wenn Sie selber die Aktualisierung bzw. Einrichtung &uuml;bernehmen wollen, so lesen Sie bitte die Datei &quot;doc/UPGRADE&quot; und folgen Sie den dort beschriebenen Schritten.</p>
-
- <p>
-  <a href="login.pl" target="_top">Anmeldung</a> |
-  <a href="admin.pl" target="_top">Administration</a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/authentication_pl_missing_en.html b/templates/webpages/login/authentication_pl_missing_en.html
deleted file mode 100644 (file)
index e71a706..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<body>
-
- <p><b>Error!</b></p>
-
- <p>The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.</p>
-
- <p>If you yourself want to upgrade the installation then please read the file &quot;doc/UPGRADE&quot; and follow the steps outlined in this file.</p>
-
- <p>
-  <a href="login.pl" target="_top">Login</a> |
-  <a href="admin.pl" target="_top">Administration</a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/authentication_pl_missing_master.html b/templates/webpages/login/authentication_pl_missing_master.html
deleted file mode 100644 (file)
index 30f87f3..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<body>
-
- <p><b><translate>Error!</translate></b></p>
-
- <p><translate>The authentication configuration file
-   &quot;config/authentication.pl&quot; does not exist. This Lx-Office
-   installation has probably not been updated correctly yet. Please
-   contact your administrator.</translate></p>
-
- <p><translate>If you yourself want to upgrade the installation then
-   please read the file &quot;doc/UPGRADE&quot; and follow the steps
-   outlined in this file.</translate></p>
-
- <p>
-  <a href="login.pl" target="_top"><translate>Login</translate></a> |
-  <a href="admin.pl" target="_top"><translate>Administration</translate></a>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
new file mode 100644 (file)
index 0000000..a306456
--- /dev/null
@@ -0,0 +1,54 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+ [%- DEFAULT myconfig_dbhost = 'localhost' %]
+
+ <center>
+  <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
+
+  <h2 class="login">[% 'Version' | $T8 %] [% version %]</h2>
+
+  <p>[% 'Licensed to' | $T8 %]</p>
+
+  <p>
+   <b>
+    [% HTML.escape(myconfig_company) %]
+    <br>
+    [% HTML.escape(myconfig_address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
+   </b>
+
+   <br>
+
+   <table border="0">
+    <tr>
+     <th align="left">[% 'User' | $T8 %]</th>
+     <td>[% HTML.escape(myconfig_name) %]</td>
+    </tr>
+    <tr>
+     <th align="left">[% 'Dataset' | $T8 %]</th>
+     <td>[% HTML.escape(myconfig_dbname) %]</td>
+    </tr>
+    <tr>
+     <th align="left">[% 'Database Host' | $T8 %]</th>
+     <td>[% HTML.escape(myconfig_dbhost) %]</td>
+    </tr>
+    <tr>
+    </tr>
+    <tr>
+    </tr>
+    <tr class="nomobile">
+     <th colspan="2" align="center"><a href="http://lx-office.org" target="blank">http://lx-office.org</a></th>
+    </tr>
+   </table>
+
+   <noscript>
+   [% INCLUDE 'generic/information.html'
+     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
+     label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
+   %]
+   </noscript>
+ </center>
+
+ [%- todo_list %]
+
+</body>
+</html>
diff --git a/templates/webpages/login/company_logo_de.html b/templates/webpages/login/company_logo_de.html
deleted file mode 100644 (file)
index d021896..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
- [%- DEFAULT myconfig_dbhost = 'localhost' %]
-
- <center>
-  <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h2 class="login">Version [% version %]</h2>
-
-  <p>Lizenziert für</p>
-
-  <p>
-   <b>
-    [% HTML.escape(myconfig_company) %]
-    <br>
-    [% HTML.escape(myconfig_address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
-   </b>
-
-   <br>
-
-   <table border="0">
-    <tr>
-     <th align="left">Benutzer</th>
-     <td>[% HTML.escape(myconfig_name) %]</td>
-    </tr>
-    <tr>
-     <th align="left">Datenbank</th>
-     <td>[% HTML.escape(myconfig_dbname) %]</td>
-    </tr>
-    <tr>
-     <th align="left">Datenbankcomputer</th>
-     <td>[% HTML.escape(myconfig_dbhost) %]</td>
-    </tr>
-    <tr>
-    </tr>
-    <tr>
-    </tr>
-    <tr class="nomobile">
-     <th colspan="2" align="center"><a href="http://lx-office.org" target="blank">http://lx-office.org</a></th>
-    </tr>
-   </table>
-
-   <noscript>
-   [% INCLUDE  'generic/information_de.html'
-     title_information = 'Ihr Browser unterstützt im Moment kein Javascript!',
-     label_information = 'Die Bedienung von Lx-Office wurde an vielen Stellen mit Javascript verbessert. Obwohl es derzeit möglich ist, jeden Aspekt von Lx-Office auch ohne Javascript zu benutzen, empfehlen wir es. In einer zukünftigen Version wird Javascript eventuell notwendig sein um weitergehende Features zu benutzen.',
-   %]
-   </noscript>
- </center>
-
- [%- todo_list %]
-
-</body>
-</html>
diff --git a/templates/webpages/login/company_logo_en.html b/templates/webpages/login/company_logo_en.html
deleted file mode 100644 (file)
index ce60d87..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
- [%- DEFAULT myconfig_dbhost = 'localhost' %]
-
- <center>
-  <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h2 class="login">Version [% version %]</h2>
-
-  <p>Licensed to</p>
-
-  <p>
-   <b>
-    [% HTML.escape(myconfig_company) %]
-    <br>
-    [% HTML.escape(myconfig_address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
-   </b>
-
-   <br>
-
-   <table border="0">
-    <tr>
-     <th align="left">User</th>
-     <td>[% HTML.escape(myconfig_name) %]</td>
-    </tr>
-    <tr>
-     <th align="left">Dataset</th>
-     <td>[% HTML.escape(myconfig_dbname) %]</td>
-    </tr>
-    <tr>
-     <th align="left">Database Host</th>
-     <td>[% HTML.escape(myconfig_dbhost) %]</td>
-    </tr>
-    <tr>
-    </tr>
-    <tr>
-    </tr>
-    <tr class="nomobile">
-     <th colspan="2" align="center"><a href="http://lx-office.org" target="blank">http://lx-office.org</a></th>
-    </tr>
-   </table>
-
-   <noscript>
-   [% INCLUDE  'generic/information_master.html'
-     title_information = 'Your browser does not currently support Javascript.',
-     label_information = 'A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.',
-   %]
-   </noscript>
- </center>
-
- [%- todo_list %]
-
-</body>
-</html>
diff --git a/templates/webpages/login/company_logo_master.html b/templates/webpages/login/company_logo_master.html
deleted file mode 100644 (file)
index e3cdf6c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
- [%- DEFAULT myconfig_dbhost = 'localhost' %]
-
- <center>
-  <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-
-  <h2 class="login"><translate>Version</translate> [% version %]</h2>
-
-  <p><translate>Licensed to</translate></p>
-
-  <p>
-   <b>
-    [% HTML.escape(myconfig_company) %]
-    <br>
-    [% HTML.escape(myconfig_address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
-   </b>
-
-   <br>
-
-   <table border="0">
-    <tr>
-     <th align="left"><translate>User</translate></th>
-     <td>[% HTML.escape(myconfig_name) %]</td>
-    </tr>
-    <tr>
-     <th align="left"><translate>Dataset</translate></th>
-     <td>[% HTML.escape(myconfig_dbname) %]</td>
-    </tr>
-    <tr>
-     <th align="left"><translate>Database Host</translate></th>
-     <td>[% HTML.escape(myconfig_dbhost) %]</td>
-    </tr>
-    <tr>
-    </tr>
-    <tr>
-    </tr>
-    <tr class="nomobile">
-     <th colspan="2" align="center"><a href="http://lx-office.org" target="blank">http://lx-office.org</a></th>
-    </tr>
-   </table>
-
-   <noscript>
-   [% INCLUDE  'generic/information_<translate>master</translate>.html'
-     title_information = '<translate>Your browser does not currently support Javascript.</translate>',
-     label_information = '<translate>A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.</translate>',
-   %]
-   </noscript>
- </center>
-
- [%- todo_list %]
-
-</body>
-</html>
diff --git a/templates/webpages/login/login_screen.html b/templates/webpages/login/login_screen.html
new file mode 100644 (file)
index 0000000..1c421fb
--- /dev/null
@@ -0,0 +1,49 @@
+[%- USE T8 %]
+[% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
+
+ <center>
+  <table class="login" border="3" cellpadding="20">
+   <tr>
+    <td class="login" align="center">
+     <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
+     <h1 class="login" align="center">[% 'Version' | $T8 %] [% version %]</h1>
+
+     [% IF error_message %]
+     <p><span class="error_message">[% error_message %]</span></p>
+     [% END %]
+
+     <p>
+
+      <form method="post" name="loginscreen" action="login.pl" target="_top">
+
+       <input type="hidden" name="show_dbupdate_warning" value="1">
+
+       <table width="100%">
+        <tr>
+         <td align="center">
+          <table>
+           <tr>
+            <th align="right">[% 'Login Name' | $T8 %]</th>
+            <td><input class="login" name="login" size="30" tabindex="1"></td>
+           </tr>
+           <tr>
+            <th align="right">[% 'Password' | $T8 %]</th>
+            <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
+           </tr>
+          </table>
+
+          <br>
+          <input type="submit" name="action" value="[% 'Login' | $T8 %]" tabindex="3">
+
+         </td>
+        </tr>
+       </table>
+
+      </form>
+
+    </td>
+   </tr>
+  </table>
+
+</body>
+</html>
diff --git a/templates/webpages/login/login_screen_de.html b/templates/webpages/login/login_screen_de.html
deleted file mode 100644 (file)
index 8a3dd7c..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
-
- <center>
-  <table class="login" border="3" cellpadding="20">
-   <tr>
-    <td class="login" align="center">
-     <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-     <h1 class="login" align="center">Version [% version %]</h1>
-
-     [% IF error_message %]
-     <p><span class="error_message">[% error_message %]</span></p>
-     [% END %]
-
-     <p>
-
-      <form method="post" name="loginscreen" action="login.pl" target="_top">
-
-       <input type="hidden" name="show_dbupdate_warning" value="1">
-
-       <table width="100%">
-        <tr>
-         <td align="center">
-          <table>
-           <tr>
-            <th align="right">Benutzername</th>
-            <td><input class="login" name="login" size="30" tabindex="1"></td>
-           </tr>
-           <tr>
-            <th align="right">Passwort</th>
-            <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
-           </tr>
-          </table>
-
-          <br>
-          <input type="submit" name="action" value="Anmeldung" tabindex="3">
-
-         </td>
-        </tr>
-       </table>
-
-      </form>
-
-    </td>
-   </tr>
-  </table>
-
-</body>
-</html>
diff --git a/templates/webpages/login/login_screen_en.html b/templates/webpages/login/login_screen_en.html
deleted file mode 100644 (file)
index bc4f6d3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
-
- <center>
-  <table class="login" border="3" cellpadding="20">
-   <tr>
-    <td class="login" align="center">
-     <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-     <h1 class="login" align="center">Version [% version %]</h1>
-
-     [% IF error_message %]
-     <p><span class="error_message">[% error_message %]</span></p>
-     [% END %]
-
-     <p>
-
-      <form method="post" name="loginscreen" action="login.pl" target="_top">
-
-       <input type="hidden" name="show_dbupdate_warning" value="1">
-
-       <table width="100%">
-        <tr>
-         <td align="center">
-          <table>
-           <tr>
-            <th align="right">Login Name</th>
-            <td><input class="login" name="login" size="30" tabindex="1"></td>
-           </tr>
-           <tr>
-            <th align="right">Password</th>
-            <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
-           </tr>
-          </table>
-
-          <br>
-          <input type="submit" name="action" value="Login" tabindex="3">
-
-         </td>
-        </tr>
-       </table>
-
-      </form>
-
-    </td>
-   </tr>
-  </table>
-
-</body>
-</html>
diff --git a/templates/webpages/login/login_screen_master.html b/templates/webpages/login/login_screen_master.html
deleted file mode 100644 (file)
index 341d894..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
-
- <center>
-  <table class="login" border="3" cellpadding="20">
-   <tr>
-    <td class="login" align="center">
-     <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-     <h1 class="login" align="center"><translate>Version</translate> [% version %]</h1>
-
-     [% IF error_message %]
-     <p><span class="error_message">[% error_message %]</span></p>
-     [% END %]
-
-     <p>
-
-      <form method="post" name="loginscreen" action="login.pl" target="_top">
-
-       <input type="hidden" name="show_dbupdate_warning" value="1">
-
-       <table width="100%">
-        <tr>
-         <td align="center">
-          <table>
-           <tr>
-            <th align="right"><translate>Login Name</translate></th>
-            <td><input class="login" name="login" size="30" tabindex="1"></td>
-           </tr>
-           <tr>
-            <th align="right"><translate>Password</translate></th>
-            <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
-           </tr>
-          </table>
-
-          <br>
-          <input type="submit" name="action" value="<translate>Login</translate>" tabindex="3">
-
-         </td>
-        </tr>
-       </table>
-
-      </form>
-
-    </td>
-   </tr>
-  </table>
-
-</body>
-</html>
diff --git a/templates/webpages/login/password_error.html b/templates/webpages/login/password_error.html
new file mode 100644 (file)
index 0000000..e1060a0
--- /dev/null
@@ -0,0 +1,11 @@
+[%- USE T8 %]
+<body>
+
+ <p><b>[% 'Error!' | $T8 %]</b></p>
+
+ <p>[% error %]</p>
+
+ <p><a href="login.pl" target="_top">[% 'Login' | $T8 %]</a></p>
+
+</body>
+</html>
diff --git a/templates/webpages/login/password_error_de.html b/templates/webpages/login/password_error_de.html
deleted file mode 100644 (file)
index 06f5058..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<body>
-
- <p><b>Fehler!</b></p>
-
- <p>[% error %]</p>
-
- <p><a href="login.pl" target="_top">Anmeldung</a></p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/password_error_en.html b/templates/webpages/login/password_error_en.html
deleted file mode 100644 (file)
index f703091..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<body>
-
- <p><b>Error!</b></p>
-
- <p>[% error %]</p>
-
- <p><a href="login.pl" target="_top">Login</a></p>
-
-</body>
-</html>
diff --git a/templates/webpages/login/password_error_master.html b/templates/webpages/login/password_error_master.html
deleted file mode 100644 (file)
index e7b30c1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<body>
-
- <p><b><translate>Error!</translate></b></p>
-
- <p>[% error %]</p>
-
- <p><a href="login.pl" target="_top"><translate>Login</translate></a></p>
-
-</body>
-</html>
diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
new file mode 100644 (file)
index 0000000..89a897e
--- /dev/null
@@ -0,0 +1,103 @@
+[%- USE T8 %]
+[% USE HTML %]<body style="padding:0px; margin:0px;">
+
+ <script type="text/javascript">
+<!--
+function clockon() {
+  var now = new Date();
+  var h = now.getHours();
+  var m = now.getMinutes();
+  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
+  var timer=setTimeout("clockon()", 10000);
+}
+window.onload=clockon
+//-->
+ </script>
+
+ <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
+
+ <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
+  <tr>
+   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
+    &nbsp;
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    &nbsp;
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
+   </td>
+   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
+    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
+   </td>
+  </tr>
+ </table>
+
+ <div id="main_menu_div"></div>
+
+ [%- SET main_id = '100' %]
+ <ul id="main_menu_model">
+ [%- FOREACH mainitem = menu_items %]
+  [%- SET main_id = main_id + 1 %]
+  <li id="[% main_id %]">
+   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target %] target="[% mainitem.target %]"[% END %]>
+    [%- HTML.escape(mainitem.title) %]
+   </a>
+   [%- IF mainitem.subitems %]
+    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
+     [%- SET sub1_id = main_id * 100 %]
+     [%- FOREACH sub1item = mainitem.subitems %]
+      [%- SET sub1_id = sub1_id + 1 %]
+      <li id="[% sub1_id %]">
+       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target %] target="[% sub1item.target %]"[% END %]>
+        [%- HTML.escape(sub1item.title) %]
+       </a>
+       [%- IF sub1item.subitems %]
+        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
+         [%- SET sub2_id = sub1_id * 100 %]
+         [%- FOREACH sub2item = sub1item.subitems %]
+          [%- SET sub2_id = sub2_id + 1 %]
+          <li id="[% sub2_id %]">
+           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target %] target="[% sub2item.target %]"[% END %]>
+            [%- HTML.escape(sub2item.title) %]
+           </a>
+          </li>
+         [%- END %]
+        </ul>
+       [%- END %]
+      </li>
+     [%- END %]
+    </ul>
+   [%- END %]
+  </li>
+ [%- END %]
+ </ul>
+
+ <script type="text/javascript">
+  <!--
+
+DHTMLSuite.createStandardObjects();
+
+DHTMLSuite.configObj.setCssPath('css/dhtmlsuite/');
+DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
+
+var menu_model = new DHTMLSuite.menuModel();
+menu_model.addItemsFromMarkup('main_menu_model');
+menu_model.init();
+
+var menu_bar = new DHTMLSuite.menuBar();
+menu_bar.addMenuItems(menu_model);
+menu_bar.setTarget('main_menu_div');
+menu_bar.init();
+
+function open_url(url, target) {
+
+}
+
+    -->
+ </script>
+
+ <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
+ </iframe>
+</body>
+</html>
diff --git a/templates/webpages/menu/menunew_de.html b/templates/webpages/menu/menunew_de.html
deleted file mode 100644 (file)
index df69700..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">neues Fenster</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
- <div id="main_menu_div"></div>
-
- [%- SET main_id = '100' %]
- <ul id="main_menu_model">
- [%- FOREACH mainitem = menu_items %]
-  [%- SET main_id = main_id + 1 %]
-  <li id="[% main_id %]">
-   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target %] target="[% mainitem.target %]"[% END %]>
-    [%- HTML.escape(mainitem.title) %]
-   </a>
-   [%- IF mainitem.subitems %]
-    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
-     [%- SET sub1_id = main_id * 100 %]
-     [%- FOREACH sub1item = mainitem.subitems %]
-      [%- SET sub1_id = sub1_id + 1 %]
-      <li id="[% sub1_id %]">
-       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target %] target="[% sub1item.target %]"[% END %]>
-        [%- HTML.escape(sub1item.title) %]
-       </a>
-       [%- IF sub1item.subitems %]
-        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
-         [%- SET sub2_id = sub1_id * 100 %]
-         [%- FOREACH sub2item = sub1item.subitems %]
-          [%- SET sub2_id = sub2_id + 1 %]
-          <li id="[% sub2_id %]">
-           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target %] target="[% sub2item.target %]"[% END %]>
-            [%- HTML.escape(sub2item.title) %]
-           </a>
-          </li>
-         [%- END %]
-        </ul>
-       [%- END %]
-      </li>
-     [%- END %]
-    </ul>
-   [%- END %]
-  </li>
- [%- END %]
- </ul>
-
- <script type="text/javascript">
-  <!--
-
-DHTMLSuite.createStandardObjects();
-
-DHTMLSuite.configObj.setCssPath('css/dhtmlsuite/');
-DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
-
-var menu_model = new DHTMLSuite.menuModel();
-menu_model.addItemsFromMarkup('main_menu_model');
-menu_model.init();
-
-var menu_bar = new DHTMLSuite.menuBar();
-menu_bar.addMenuItems(menu_model);
-menu_bar.setTarget('main_menu_div');
-menu_bar.init();
-
-function open_url(url, target) {
-
-}
-
-    -->
- </script>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menunew_en.html b/templates/webpages/menu/menunew_en.html
deleted file mode 100644 (file)
index 5d8bd45..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">new Window</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">print</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [User: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">logout</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
- <div id="main_menu_div"></div>
-
- [%- SET main_id = '100' %]
- <ul id="main_menu_model">
- [%- FOREACH mainitem = menu_items %]
-  [%- SET main_id = main_id + 1 %]
-  <li id="[% main_id %]">
-   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target %] target="[% mainitem.target %]"[% END %]>
-    [%- HTML.escape(mainitem.title) %]
-   </a>
-   [%- IF mainitem.subitems %]
-    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
-     [%- SET sub1_id = main_id * 100 %]
-     [%- FOREACH sub1item = mainitem.subitems %]
-      [%- SET sub1_id = sub1_id + 1 %]
-      <li id="[% sub1_id %]">
-       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target %] target="[% sub1item.target %]"[% END %]>
-        [%- HTML.escape(sub1item.title) %]
-       </a>
-       [%- IF sub1item.subitems %]
-        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
-         [%- SET sub2_id = sub1_id * 100 %]
-         [%- FOREACH sub2item = sub1item.subitems %]
-          [%- SET sub2_id = sub2_id + 1 %]
-          <li id="[% sub2_id %]">
-           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target %] target="[% sub2item.target %]"[% END %]>
-            [%- HTML.escape(sub2item.title) %]
-           </a>
-          </li>
-         [%- END %]
-        </ul>
-       [%- END %]
-      </li>
-     [%- END %]
-    </ul>
-   [%- END %]
-  </li>
- [%- END %]
- </ul>
-
- <script type="text/javascript">
-  <!--
-
-DHTMLSuite.createStandardObjects();
-
-DHTMLSuite.configObj.setCssPath('css/dhtmlsuite/');
-DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
-
-var menu_model = new DHTMLSuite.menuModel();
-menu_model.addItemsFromMarkup('main_menu_model');
-menu_model.init();
-
-var menu_bar = new DHTMLSuite.menuBar();
-menu_bar.addMenuItems(menu_model);
-menu_bar.setTarget('main_menu_div');
-menu_bar.init();
-
-function open_url(url, target) {
-
-}
-
-    -->
- </script>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menunew_master.html b/templates/webpages/menu/menunew_master.html
deleted file mode 100644 (file)
index 4857216..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank"><translate>new Window</translate></a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
- <div id="main_menu_div"></div>
-
- [%- SET main_id = '100' %]
- <ul id="main_menu_model">
- [%- FOREACH mainitem = menu_items %]
-  [%- SET main_id = main_id + 1 %]
-  <li id="[% main_id %]">
-   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target %] target="[% mainitem.target %]"[% END %]>
-    [%- HTML.escape(mainitem.title) %]
-   </a>
-   [%- IF mainitem.subitems %]
-    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
-     [%- SET sub1_id = main_id * 100 %]
-     [%- FOREACH sub1item = mainitem.subitems %]
-      [%- SET sub1_id = sub1_id + 1 %]
-      <li id="[% sub1_id %]">
-       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target %] target="[% sub1item.target %]"[% END %]>
-        [%- HTML.escape(sub1item.title) %]
-       </a>
-       [%- IF sub1item.subitems %]
-        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
-         [%- SET sub2_id = sub1_id * 100 %]
-         [%- FOREACH sub2item = sub1item.subitems %]
-          [%- SET sub2_id = sub2_id + 1 %]
-          <li id="[% sub2_id %]">
-           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target %] target="[% sub2item.target %]"[% END %]>
-            [%- HTML.escape(sub2item.title) %]
-           </a>
-          </li>
-         [%- END %]
-        </ul>
-       [%- END %]
-      </li>
-     [%- END %]
-    </ul>
-   [%- END %]
-  </li>
- [%- END %]
- </ul>
-
- <script type="text/javascript">
-  <!--
-
-DHTMLSuite.createStandardObjects();
-
-DHTMLSuite.configObj.setCssPath('css/dhtmlsuite/');
-DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
-
-var menu_model = new DHTMLSuite.menuModel();
-menu_model.addItemsFromMarkup('main_menu_model');
-menu_model.init();
-
-var menu_bar = new DHTMLSuite.menuBar();
-menu_bar.addMenuItems(menu_model);
-menu_bar.setTarget('main_menu_div');
-menu_bar.init();
-
-function open_url(url, target) {
-
-}
-
-    -->
- </script>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
new file mode 100644 (file)
index 0000000..9da6236
--- /dev/null
@@ -0,0 +1,46 @@
+[%- USE T8 %]
+[% USE HTML %]<body style="padding:0px; margin:0px;">
+
+ <script type="text/javascript">
+<!--
+function clockon() {
+  var now = new Date();
+  var h = now.getHours();
+  var m = now.getMinutes();
+  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
+  var timer=setTimeout("clockon()", 10000);
+}
+window.onload=clockon
+//-->
+ </script>
+
+ <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
+  <tr>
+   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
+    &nbsp;
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    &nbsp;
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
+   </td>
+   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
+    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
+   </td>
+  </tr>
+ </table>
+
+
+ <div id="menu">
+
+  [% menu %]
+
+ </div>
+
+ <div style="clear: both;"></div>
+
+ <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
+ </iframe>
+</body>
+</html>
diff --git a/templates/webpages/menu/menuv3_de.html b/templates/webpages/menu/menuv3_de.html
deleted file mode 100644 (file)
index 4687de2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">neues Fenster</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv3_en.html b/templates/webpages/menu/menuv3_en.html
deleted file mode 100644 (file)
index a09e3d2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">new Window</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">print</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [User: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">logout</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv3_master.html b/templates/webpages/menu/menuv3_master.html
deleted file mode 100644 (file)
index 00f76d8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank"><translate>new Window</translate></a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv4.html b/templates/webpages/menu/menuv4.html
new file mode 100644 (file)
index 0000000..4ae7d19
--- /dev/null
@@ -0,0 +1,46 @@
+[%- USE T8 %]
+[% USE HTML %]<body style="padding:0px; margin:0px;">
+
+ <script type="text/javascript">
+<!--
+function clockon() {
+  var now = new Date();
+  var h = now.getHours();
+  var m = now.getMinutes();
+  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
+  var timer=setTimeout("clockon()", 10000);
+}
+window.onload=clockon
+//-->
+ </script>
+
+ <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
+  <tr>
+   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
+    &nbsp;
+    [<a href="menuv4.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    &nbsp;
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
+   </td>
+   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
+    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
+   </td>
+  </tr>
+ </table>
+
+
+ <div id="menu">
+
+  [% menu %]
+
+ </div>
+
+ <div style="clear: both;"></div>
+
+ <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
+ </iframe>
+</body>
+</html>
diff --git a/templates/webpages/menu/menuv4_de.html b/templates/webpages/menu/menuv4_de.html
deleted file mode 100644 (file)
index 7176a7d..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank">neues Fenster</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv4_en.html b/templates/webpages/menu/menuv4_en.html
deleted file mode 100644 (file)
index e44af21..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank">new Window</a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()">print</a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [User: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">logout</a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/menu/menuv4_master.html b/templates/webpages/menu/menuv4_master.html
deleted file mode 100644 (file)
index 43d244b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[% USE HTML %]<body style="padding:0px; margin:0px;">
-
- <script type="text/javascript">
-<!--
-function clockon() {
-  var now = new Date();
-  var h = now.getHours();
-  var m = now.getMinutes();
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
-  var timer=setTimeout("clockon()", 10000);
-}
-window.onload=clockon
-//-->
- </script>
-
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
-    &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank"><translate>new Window</translate></a>]
-    &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
-    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
-
- <div id="menu">
-
-  [% menu %]
-
- </div>
-
- <div style="clear: both;"></div>
-
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
- </iframe>
-</body>
-</html>
diff --git a/templates/webpages/oe/check_for_direct_delivery.html b/templates/webpages/oe/check_for_direct_delivery.html
new file mode 100644 (file)
index 0000000..35a5135
--- /dev/null
@@ -0,0 +1,87 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop" width="100%">[% 'Carry over shipping address' | $T8 %]</div>
+
+ <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
+
+ <p>
+  <table>
+   <tr>
+    <th align="right" valign="top">[% 'Name' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Department' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">&nbsp;</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_2) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Street' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Zipcode' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'City' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Country' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Contact' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Phone' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'Fax' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" valign="top">[% 'E-mail' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
+   </tr>
+  </table>
+ </p>
+
+  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
+ </p>
+
+ <form method="post" action="oe.pl">
+
+  <p>
+   <input type="submit" name="action" value="[% 'Yes' | $T8 %]">&nbsp;
+   <input type="submit" name="action" value="[% 'No' | $T8 %]">
+  </p>
+
+  <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
+  <input type="hidden" name="no_nextsub" value="check_for_direct_delivery_no">
+
+  [%- FOREACH row = VARIABLES %]
+  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
+  [%- END %]
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/oe/check_for_direct_delivery_de.html b/templates/webpages/oe/check_for_direct_delivery_de.html
deleted file mode 100644 (file)
index 7ab223b..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" width="100%">Lieferadresse &uuml;bernehmen</div>
-
- <p>Sie haben die folgende Lieferadresse eingegeben oder ausgew&auml;hlt:</p>
-
- <p>
-  <table>
-   <tr>
-    <th align="right" valign="top">Name:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Abteilung:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">&nbsp;</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_2) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Straße:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">PLZ:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Stadt:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Land:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Kontakt:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Telefon:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Fax:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">eMail:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
-   </tr>
-  </table>
- </p>
-
-  Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag &uuml;bernehmen, damit der H&auml;ndler die Waren direkt an Ihren Kunden liefern kann?
- </p>
-
- <form method="post" action="oe.pl">
-
-  <p>
-   <input type="submit" name="action" value="Ja">&nbsp;
-   <input type="submit" name="action" value="Nein">
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
-  <input type="hidden" name="no_nextsub" value="check_for_direct_delivery_no">
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/check_for_direct_delivery_en.html b/templates/webpages/oe/check_for_direct_delivery_en.html
deleted file mode 100644 (file)
index 01daf5b..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" width="100%">Carry over shipping address</div>
-
- <p>You have entered or selected the following shipping address for this customer:</p>
-
- <p>
-  <table>
-   <tr>
-    <th align="right" valign="top">Name:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Department:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">&nbsp;</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_2) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Street:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Zipcode:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">City:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Country:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Contact:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Phone:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">Fax:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">E-mail:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
-   </tr>
-  </table>
- </p>
-
-  Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?
- </p>
-
- <form method="post" action="oe.pl">
-
-  <p>
-   <input type="submit" name="action" value="Yes">&nbsp;
-   <input type="submit" name="action" value="No">
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
-  <input type="hidden" name="no_nextsub" value="check_for_direct_delivery_no">
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
- </form>
-
-</body>
-</html>
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 (file)
index d434fc2..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" width="100%"><translate>Carry over shipping address</translate></div>
-
- <p><translate>You have entered or selected the following shipping address for this customer:</translate></p>
-
- <p>
-  <table>
-   <tr>
-    <th align="right" valign="top"><translate>Name</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Department</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">&nbsp;</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_2) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Street</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Zipcode</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>City</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Country</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Contact</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Phone</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>Fax</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top"><translate>E-mail</translate>:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
-   </tr>
-  </table>
- </p>
-
-  <translate>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?</translate>
- </p>
-
- <form method="post" action="oe.pl">
-
-  <p>
-   <input type="submit" name="action" value="<translate>Yes</translate>">&nbsp;
-   <input type="submit" name="action" value="<translate>No</translate>">
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
-  <input type="hidden" name="no_nextsub" value="check_for_direct_delivery_no">
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
new file mode 100644 (file)
index 0000000..de6d7b9
--- /dev/null
@@ -0,0 +1,171 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left">[% 'Notes' | $T8 %]</th>
+                <th align="left">[% 'Internal Notes' | $T8 %]</th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
+                <td>[% intnotes %]</td>
+              </tr>
+              <tr>
+                <th align="right">[% 'Payment Terms' | $T8 %]</th>
+                <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
+                           label_key  = 'description',
+                           show_empty = 1 -%]
+                </td>
+            </tr>
+      [%- IF id && num_follow_ups %]
+      <tr>
+       <td colspan="2">[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]</td>
+      </tr>
+      [%- END %]
+      </table>
+          </td>
+[%- IF is_sales %]
+          <td>
+            <table>
+
+            <tr>
+              <th  align="left">[% 'Ertrag' | $T8 %]</th>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
+            </tr>
+            <tr>
+              <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
+            </tr>
+
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
+            </table>
+          </td>
+[%- END %]
+          <td align="right">
+[%- IF taxaccounts %]
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
+[%- END %]
+            <table>
+[%- IF NOT taxincluded %]
+              <tr>
+                <th align='right'>[% 'Subtotal' | $T8 %]</th>
+                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
+              </tr>
+[%- END %]
+              [% tax %]
+              <tr>
+                <th align="right">[% 'Total' | $T8 %]</th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+
+[%- IF webdav %]
+  <tr>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+  <tr>
+   <td>
+    <table width="100%">
+     <tr>
+      <td align="left" width="30%"><b>Dateiname</b></td>
+      <td align="left" width="70%"><b>Webdavlink</b></td>
+     </tr>
+ [%- FOREACH file = WEBDAV %]
+      <tr>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
+      </tr>
+ [%- END %]
+    </table>
+   </td>
+  </tr>
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+[%- END %]
+
+  <tr>
+    <td>
+      [% print_options %]
+    </td>
+  </tr>
+</table>
+
+[% label_edit %]<br>
+<input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save and Close' | $T8 %]">
+
+[%- IF id %]
+  <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="[% 'history' | $T8 %]">
+
+  <br>[% label_workflow %]<br>
+  <input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+
+  [%- IF is_sales_quo %]
+    <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
+  [%- END %]
+
+  [%- IF is_req_quo %]
+    <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
+  [%- END %]
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="[% 'Delivery Order' | $T8 %]">
+  [%- END %]
+
+  <input class="submit" type="submit" name="action" value="[% 'Invoice' | $T8 %]">
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
+    [%- IF is_sales_ord %]
+      <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Quotation' | $T8 %]">
+    [%- ELSE %]
+    [%- IF is_pur_ord %]
+      <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Request for Quotation' | $T8 %]">
+    [%- END %]
+    [%- END %]
+  [%- END %]
+[%- END %]
+<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input type="hidden" name="callback" value="[% callback %]">
+[% IF vc == 'customer' %]
+  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
+[% ELSE %]
+  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
+[% END %]
+
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html
deleted file mode 100644 (file)
index e2c2e96..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left">Bemerkungen</th>
-                <th align="left">interne Bemerkungen</th>
-              </tr>
-              <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
-              </tr>
-              <tr>
-                <th align="right">Zahlungskonditionen</th>
-                <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                </td>
-            </tr>
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left">Ertrag</th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
-            </tr>
-            <tr>
-              <th  align="left">Ertrag prozentual</th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
-              <td>%</td>
-            </tr>
-
-            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-[%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
-[%- END %]
-            <table>
-[%- IF NOT taxincluded %]
-              <tr>
-                <th align='right'>Zwischensumme</th>
-                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
-              </tr>
-[%- END %]
-              [% tax %]
-              <tr>
-                <th align="right">Summe</th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <table width="100%">
-     <tr>
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-     </tr>
- [%- FOREACH file = WEBDAV %]
-      <tr>
-        <td align="left">[% HTML.escape(file.name) %]</td>
-        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
-      </tr>
- [%- END %]
-    </table>
-   </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-[%- END %]
-
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
-
-[% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-<input class="submit" type="submit" name="action" value="Lieferadresse">
-<input class="submit" type="submit" name="action" value="Drucken">
-<input class="submit" type="submit" name="action" value="eMail">
-<input class="submit" type="submit" name="action" value="Speichern">
-<input class="submit" type="submit" name="action" value="Speichern und schließen">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="Historie">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="als neu speichern">
-  <input class="submit" type="submit" name="action" value="Löschen">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="Kundenauftrag">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="Lieferschein">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action" value="Rechnung">
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-    [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
-     <input class="submit" type="submit" name="action" value="Angebot">
-    [%- ELSE %]
-    [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action" value="Kundenauftrag">
-     <input class="submit" type="submit" name="action" value="Anfrage">
-    [%- END %]
-    [%- END %]
-  [%- END %]
-[%- END %]
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
-[% IF vc == 'customer' %]
-  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
-[% ELSE %]
-  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
-[% END %]
-
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/form_footer_en.html b/templates/webpages/oe/form_footer_en.html
deleted file mode 100644 (file)
index ca19aaa..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left">Notes</th>
-                <th align="left">Internal Notes</th>
-              </tr>
-              <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
-              </tr>
-              <tr>
-                <th align="right">Payment Terms</th>
-                <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                </td>
-            </tr>
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.format_string('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left">Ertrag</th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
-            </tr>
-            <tr>
-              <th  align="left">Ertrag prozentual</th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
-              <td>%</td>
-            </tr>
-
-            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-[%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Tax Included</b><br><br>
-[%- END %]
-            <table>
-[%- IF NOT taxincluded %]
-              <tr>
-                <th align='right'>Subtotal</th>
-                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
-              </tr>
-[%- END %]
-              [% tax %]
-              <tr>
-                <th align="right">Total</th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <table width="100%">
-     <tr>
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-     </tr>
- [%- FOREACH file = WEBDAV %]
-      <tr>
-        <td align="left">[% HTML.escape(file.name) %]</td>
-        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
-      </tr>
- [%- END %]
-    </table>
-   </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-[%- END %]
-
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
-
-[% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="Update">
-<input class="submit" type="submit" name="action" value="Ship to">
-<input class="submit" type="submit" name="action" value="Print">
-<input class="submit" type="submit" name="action" value="E-mail">
-<input class="submit" type="submit" name="action" value="Save">
-<input class="submit" type="submit" name="action" value="Save and Close">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="Follow-Up">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="history">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="Save as new">
-  <input class="submit" type="submit" name="action" value="Delete">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="Sales Order">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="Purchase Order">
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="Delivery Order">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action" value="Invoice">
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-    [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action" value="Purchase Order">
-     <input class="submit" type="submit" name="action" value="Quotation">
-    [%- ELSE %]
-    [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action" value="Sales Order">
-     <input class="submit" type="submit" name="action" value="Request for Quotation">
-    [%- END %]
-    [%- END %]
-  [%- END %]
-[%- END %]
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
-[% IF vc == 'customer' %]
-  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
-[% ELSE %]
-  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
-[% END %]
-
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
deleted file mode 100644 (file)
index 9de0939..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left"><translate>Notes</translate></th>
-                <th align="left"><translate>Internal Notes</translate></th>
-              </tr>
-              <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
-              </tr>
-              <tr>
-                <th align="right"><translate>Payment Terms</translate></th>
-                <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                </td>
-            </tr>
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left"><translate>Ertrag</translate></th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
-            </tr>
-            <tr>
-              <th  align="left"><translate>Ertrag prozentual</translate></th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
-              <td>%</td>
-            </tr>
-
-            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-[%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
-[%- END %]
-            <table>
-[%- IF NOT taxincluded %]
-              <tr>
-                <th align='right'><translate>Subtotal</translate></th>
-                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
-              </tr>
-[%- END %]
-              [% tax %]
-              <tr>
-                <th align="right"><translate>Total</translate></th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <table width="100%">
-     <tr>
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-     </tr>
- [%- FOREACH file = WEBDAV %]
-      <tr>
-        <td align="left">[% HTML.escape(file.name) %]</td>
-        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
-      </tr>
- [%- END %]
-    </table>
-   </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-[%- END %]
-
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
-
-[% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-    [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-     <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
-    [%- ELSE %]
-    [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-     <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
-    [%- END %]
-    [%- END %]
-  [%- END %]
-[%- END %]
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
-[% IF vc == 'customer' %]
-  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
-[% ELSE %]
-  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
-[% END %]
-
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
new file mode 100644 (file)
index 0000000..ba6c9cc
--- /dev/null
@@ -0,0 +1,274 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body onLoad="[% onload %]">
+
+  <form method="post" name="oe" action="[% script %]">
+
+    <script type="text/javascript" src="js/common.js"></script>
+    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+    <script type="text/javascript" src="js/vendor_selection.js"></script>
+    <script type="text/javascript" src="js/calculate_qty.js"></script>
+    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
+    <script type="text/javascript" src="js/follow_up.js"></script>
+
+[%- FOREACH row = HIDDENS %]
+   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
+[%- END %]
+
+    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+
+    <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
+    <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
+    <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+    <input type="hidden" name="follow_up_rowcount" value="1">
+
+    <div class="listtop">[% title %]</div>
+
+    <table width="100%">
+      <tr height="5"></tr>
+      <tr>
+        <td>
+          <table width="100%">
+            <tr valign="top">
+              <td width="50%">
+                <table width="100%">
+                  <tr>
+                    <th align="right">[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
+                    <td>
+                      [%- 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();" -%]
+                      <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+                    </td>
+                  </tr>
+[%- IF ALL_CONTACTS.size %]
+                  <tr>
+                    <th align="right">[% 'Contact Person' | $T8 %]</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
+                           label_sub  = 'contact_labels',
+                           show_empty = 1 -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+                  <tr>
+                    <th align="right">[% 'Shipping Address' | $T8 %]</th>
+                    <td>
+                      [%- 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();" -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <td align="right">[% 'Credit Limit' | $T8 %]</td>
+                    <td>[% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
+                  </tr>
+[%- END %]
+[%- IF business %]
+                  <tr>
+                    <th align="right">[% business_label %]</th>
+                    <td>[% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %</td>
+                  </tr>
+[%- END %]
+[%- IF max_dunning_level %]
+                  <tr>
+                    <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
+                    <td>
+                      <b>[% HTML.escape(max_dunning_level) %]</b>;
+                      [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right">[% 'Steuersatz' | $T8 %]</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
+                           label_key  = 'description' -%]
+                    </td>
+                  </tr>
+[%- IF ALL_DEPARTMENTS %]
+                  <tr>
+                    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+                    <td colspan="3">
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'department_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_DEPARTMENTS,
+                           id_key     = 'id',
+                           label_sub  = 'department_labels',
+                           show_empty = 1 -%]
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+[%- IF currencies %]
+                  <tr>
+                    <th align="right">[% 'Currency' | $T8 %]</th>
+                    <td>[% currencies %]</td>
+                  </tr>
+[%- END %]
+[%- IF show_exchangerate %]
+                  <tr>
+                    <th align="right">[% 'Exchangerate' | $T8 %]</th>
+                    <td>
+                     [%- IF forex %]
+                      [% LxERP.format_amount(exchangerate, 2) %]
+                     [%- ELSE %]
+                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                     [%- END %]
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right">[% 'Shipping Point' | $T8 %]</th>
+                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right">[% 'Ship via' | $T8 %]</th>
+                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right">[% 'Transaction description' | $T8 %]</th>
+                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
+                  </tr>
+[%- IF show_delivery_customer %]
+                  <tr>
+                    <td colspan="4">
+                      <table>
+                        <tr>
+                          <td colspan="2">
+                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">[% 'Choose Customer' | $T8 %]</button>
+                        </td>
+                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
+                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">[% 'Choose Vendor' | $T8 %]</button>
+                          </td>
+                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
+                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+[%- END %]
+                </table>
+              </td>
+              <td align="right">
+                <table>
+              [% openclosed %]
+                  <tr>
+                    <th align="right">[% 'Employee' | $T8 %]</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    </td>
+                  </tr>
+[%- IF is_sales and ALL_SALESMEN.size %]
+                  <tr>
+                    <th align="right">[% 'Salesman' | $T8 %]</th>
+                    <td>
+                      [%- 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' -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]</th>
+                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
+                  </tr>
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
+                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_order %]
+                      [% 'Order Date' | $T8 %]
+                     [%- ELSE %]
+                      [% 'Quotation Date' | $T8 %]
+                     [%- END %]
+                    </th>
+                    <td nowrap>
+                      <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
+                      <input type=button name=transdate id="trigger1" value="[% 'button' | $T8 %]">
+                    </td>
+                  </tr>
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_sales_quo %]
+                      [% 'Valid until' | $T8 %]
+                     [%- ELSE %]
+                      [% 'Required by' | $T8 %]
+                     [%- END %]
+                    </th>
+                    <td nowrap>
+                      <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
+                      <input type=button name=reqdate id="trigger2" value="[% 'button' | $T8 %]">
+                    </td>
+                  </tr>
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
+                    <td>
+                      [%- 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();" -%]
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+    <script type="text/javascript">
+     <!--
+       Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+       Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+     //-->
+    </script>
diff --git a/templates/webpages/oe/form_header_de.html b/templates/webpages/oe/form_header_de.html
deleted file mode 100644 (file)
index ba4bd1b..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="[% onload %]">
-
-  <form method="post" name="oe" action="[% script %]">
-
-    <script type="text/javascript" src="js/common.js"></script>
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/vendor_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-
-    <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
-    <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
-    <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-
-    <div class="listtop">[% title %]</div>
-
-    <table width="100%">
-      <tr height="5"></tr>
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <th align="right">[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% END %]</th>
-                    <td>
-                      [%- 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();" -%]
-                      <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right">Ansprechpartner</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  <tr>
-                    <th align="right">Lieferadresse</th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <td align="right">Kreditlimit</td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; Rest <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; Rabatt [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right">höchste Mahnstufe:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Steuersatz</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    </td>
-                  </tr>
-[%- IF ALL_DEPARTMENTS %]
-                  <tr>
-                    <th align="right" nowrap>Abteilung</th>
-                    <td colspan="3">
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'department_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_DEPARTMENTS,
-                           id_key     = 'id',
-                           label_sub  = 'department_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-[%- IF currencies %]
-                  <tr>
-                    <th align="right">Währung</th>
-                    <td>[% currencies %]</td>
-                  </tr>
-[%- END %]
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right">Wechselkurs</th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 2) %]
-                     [%- ELSE %]
-                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Versandort</th>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Transportmittel</th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Vorgangsbezeichnung</th>
-                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Endkunde wählen:</button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Händler wählen</button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right">Bearbeiter</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right">Verkäufer/in</th>
-                    <td>
-                      [%- 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' -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Auftragsnummer</th>
-                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
-                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
-                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      Auftragsdatum
-                     [%- ELSE %]
-                      Angebotsdatum
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=transdate id="trigger1" value="?">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      gültig bis
-                     [%- ELSE %]
-                      Lieferdatum
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=reqdate id="trigger2" value="?">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap>Projektnummer</th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-    <script type="text/javascript">
-     <!--
-       Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     //-->
-    </script>
diff --git a/templates/webpages/oe/form_header_en.html b/templates/webpages/oe/form_header_en.html
deleted file mode 100644 (file)
index c175867..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="[% onload %]">
-
-  <form method="post" name="oe" action="[% script %]">
-
-    <script type="text/javascript" src="js/common.js"></script>
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/vendor_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-
-    <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
-    <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
-    <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-
-    <div class="listtop">[% title %]</div>
-
-    <table width="100%">
-      <tr height="5"></tr>
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <th align="right">[% IF vc == 'customer' %]Customer[% ELSE %]Vendor[% END %]</th>
-                    <td>
-                      [%- 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();" -%]
-                      <input type="button" value="Details (one letter abbreviation)" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right">Contact Person</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  <tr>
-                    <th align="right">Shipping Address</th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <td align="right">Credit Limit</td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; Remaining <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; Trade Discount [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right">Max. Dunning Level:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      Dunning Amount: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Steuersatz</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    </td>
-                  </tr>
-[%- IF ALL_DEPARTMENTS %]
-                  <tr>
-                    <th align="right" nowrap>Department</th>
-                    <td colspan="3">
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'department_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_DEPARTMENTS,
-                           id_key     = 'id',
-                           label_sub  = 'department_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-[%- IF currencies %]
-                  <tr>
-                    <th align="right">Currency</th>
-                    <td>[% currencies %]</td>
-                  </tr>
-[%- END %]
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right">Exchangerate</th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 2) %]
-                     [%- ELSE %]
-                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Shipping Point</th>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Ship via</th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Transaction description</th>
-                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Choose Customer</button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Choose Vendor</button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right">Employee</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right">Salesman</th>
-                    <td>
-                      [%- 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' -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Order Number</th>
-                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]RFQ Number[% ELSE %]Quotation Number[% END %]</th>
-                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Customer Order Number</th>
-                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      Order Date
-                     [%- ELSE %]
-                      Quotation Date
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=transdate id="trigger1" value="button">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      Valid until
-                     [%- ELSE %]
-                      Required by
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=reqdate id="trigger2" value="button">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap>Project Number</th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-    <script type="text/javascript">
-     <!--
-       Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     //-->
-    </script>
diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
deleted file mode 100644 (file)
index 27ae250..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="[% onload %]">
-
-  <form method="post" name="oe" action="[% script %]">
-
-    <script type="text/javascript" src="js/common.js"></script>
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/vendor_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-
-    <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
-    <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
-    <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-
-    <div class="listtop">[% title %]</div>
-
-    <table width="100%">
-      <tr height="5"></tr>
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <th align="right">[% IF vc == 'customer' %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
-                    <td>
-                      [%- 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();" -%]
-                      <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right"><translate>Contact Person</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  <tr>
-                    <th align="right"><translate>Shipping Address</translate></th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <td align="right"><translate>Credit Limit</translate></td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; <translate>Remaining</translate> <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; <translate>Trade Discount</translate> [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right"><translate>Max. Dunning Level</translate>:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right"><translate>Steuersatz</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    </td>
-                  </tr>
-[%- IF ALL_DEPARTMENTS %]
-                  <tr>
-                    <th align="right" nowrap><translate>Department</translate></th>
-                    <td colspan="3">
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'department_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_DEPARTMENTS,
-                           id_key     = 'id',
-                           label_sub  = 'department_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-[%- IF currencies %]
-                  <tr>
-                    <th align="right"><translate>Currency</translate></th>
-                    <td>[% currencies %]</td>
-                  </tr>
-[%- END %]
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right"><translate>Exchangerate</translate></th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 2) %]
-                     [%- ELSE %]
-                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right"><translate>Shipping Point</translate></th>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right"><translate>Ship via</translate></th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right"><translate>Transaction description</translate></th>
-                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')"><translate>Choose Customer</translate></button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')"><translate>Choose Vendor</translate></button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right"><translate>Employee</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right"><translate>Salesman</translate></th>
-                    <td>
-                      [%- 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' -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
-                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
-                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
-                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      <translate>Order Date</translate>
-                     [%- ELSE %]
-                      <translate>Quotation Date</translate>
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=transdate id="trigger1" value="<translate>button</translate>">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      <translate>Valid until</translate>
-                     [%- ELSE %]
-                      <translate>Required by</translate>
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=reqdate id="trigger2" value="<translate>button</translate>">
-                    </td>
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
-                    <td>
-                      [%- 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();" -%]
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-    <script type="text/javascript">
-     <!--
-       Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-     //-->
-    </script>
diff --git a/templates/webpages/oe/orders_bottom.html b/templates/webpages/oe/orders_bottom.html
new file mode 100644 (file)
index 0000000..5ceb69c
--- /dev/null
@@ -0,0 +1,12 @@
+[%- USE T8 %]
+[% USE HTML %]
+ [%- IF SHOW_CONTINUE_BUTTON %]
+ [% 'New sales order' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+ [%- END %]
+ <input type="hidden" name="nextsub" value="edit">
+ <input type="hidden" name="type" value="[% HTML.escape(type) %]">
+ <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+ <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+ <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+</form>
diff --git a/templates/webpages/oe/orders_bottom_de.html b/templates/webpages/oe/orders_bottom_de.html
deleted file mode 100644 (file)
index fbe82b3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- [%- IF SHOW_CONTINUE_BUTTON %]
- Neuer Auftrag<br>
- <input class="submit" type="submit" name="action" value="Weiter">
- [%- END %]
- <input type="hidden" name="nextsub" value="edit">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/oe/orders_bottom_en.html b/templates/webpages/oe/orders_bottom_en.html
deleted file mode 100644 (file)
index fe17a83..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- [%- IF SHOW_CONTINUE_BUTTON %]
- New sales order<br>
- <input class="submit" type="submit" name="action" value="Continue">
- [%- END %]
- <input type="hidden" name="nextsub" value="edit">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/oe/orders_bottom_master.html b/templates/webpages/oe/orders_bottom_master.html
deleted file mode 100644 (file)
index d1a9d90..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE HTML %]
- [%- IF SHOW_CONTINUE_BUTTON %]
- <translate>New sales order</translate><br>
- <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
- [%- END %]
- <input type="hidden" name="nextsub" value="edit">
- <input type="hidden" name="type" value="[% HTML.escape(type) %]">
- <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
- <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-</form>
diff --git a/templates/webpages/oe/orders_top.html b/templates/webpages/oe/orders_top.html
new file mode 100644 (file)
index 0000000..f6bc1de
--- /dev/null
@@ -0,0 +1 @@
+<form method="post" action="oe.pl">
diff --git a/templates/webpages/oe/orders_top_de.html b/templates/webpages/oe/orders_top_de.html
deleted file mode 100644 (file)
index f6bc1de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="oe.pl">
diff --git a/templates/webpages/oe/orders_top_en.html b/templates/webpages/oe/orders_top_en.html
deleted file mode 100644 (file)
index f6bc1de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="oe.pl">
diff --git a/templates/webpages/oe/orders_top_master.html b/templates/webpages/oe/orders_top_master.html
deleted file mode 100644 (file)
index f6bc1de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="oe.pl">
diff --git a/templates/webpages/oe/report_for_todo_list.html b/templates/webpages/oe/report_for_todo_list.html
new file mode 100644 (file)
index 0000000..6b8a184
--- /dev/null
@@ -0,0 +1,45 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+
+<div class="listtop">[% 'Overdue sales quotations and requests for quotations' | $T8 %]</div>
+
+<p>
+ <table width="100%">
+  <tr>
+   <td class="listheading">[% 'Date' | $T8 %]</td>
+   <td class="listheading">[% 'Valid until' | $T8 %]</td>
+   <td class="listheading">[% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %]</td>
+   <td class="listheading">[% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %]</td>
+   <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+   <td class="listheading">[% 'Amount' | $T8 %]</td>
+   <td class="listheading">[% 'Employee' | $T8 %]</td>
+  </tr>
+
+  [%- FOREACH row = QUOTATIONS %]
+  <tr class="listrow[% loop.count % 2 %]">
+   <td>[% HTML.escape(row.transdate) %]</td>
+   <td>[% HTML.escape(row.reqdate) %]</td>
+   <td>
+    <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
+     [% IF row.vc == 'customer' %]
+     [% 'Sales quotation' | $T8 %]
+     [% ELSE %]
+     [% 'Request quotation' | $T8 %]
+     [% END %]
+     [% HTML.escape(row.quonumber) %]
+    </a>
+   </td>
+   <td>
+    [% IF row.vc == 'customer' %]
+    [% HTML.escape(row.customer) %]
+    [% ELSE %]
+    [% HTML.escape(row.vendor) %]
+    [% END %]
+   </td>
+   <td>[% HTML.escape(row.transaction_description) %]</td>
+   <td>[% HTML.escape(LxERP.format_amount(row.amount, 2)) %]</td>
+   <td>[% HTML.escape(row.employee) %]</td>
+  </tr>
+  [%- END %]
+ </table>
+</p>
diff --git a/templates/webpages/oe/report_for_todo_list_de.html b/templates/webpages/oe/report_for_todo_list_de.html
deleted file mode 100644 (file)
index 6ecfbcd..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<div class="listtop">Überfällige Angebote und Preisanfragen</div>
-
-<p>
- <table width="100%">
-  <tr>
-   <td class="listheading">Datum</td>
-   <td class="listheading">gültig bis</td>
-   <td class="listheading">Angebot / Preisanfrage</td>
-   <td class="listheading">Kunde / Lieferant</td>
-   <td class="listheading">Vorgangsbezeichnung</td>
-   <td class="listheading">Betrag</td>
-   <td class="listheading">Bearbeiter</td>
-  </tr>
-
-  [%- FOREACH row = QUOTATIONS %]
-  <tr class="listrow[% loop.count % 2 %]">
-   <td>[% HTML.escape(row.transdate) %]</td>
-   <td>[% HTML.escape(row.reqdate) %]</td>
-   <td>
-    <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
-     [% IF row.vc == 'customer' %]
-     Angebot
-     [% ELSE %]
-     Preisanfrage
-     [% END %]
-     [% HTML.escape(row.quonumber) %]
-    </a>
-   </td>
-   <td>
-    [% IF row.vc == 'customer' %]
-    [% HTML.escape(row.customer) %]
-    [% ELSE %]
-    [% HTML.escape(row.vendor) %]
-    [% END %]
-   </td>
-   <td>[% HTML.escape(row.transaction_description) %]</td>
-   <td>[% HTML.escape(LxERP.format_amount(row.amount, 2)) %]</td>
-   <td>[% HTML.escape(row.employee) %]</td>
-  </tr>
-  [%- END %]
- </table>
-</p>
diff --git a/templates/webpages/oe/report_for_todo_list_en.html b/templates/webpages/oe/report_for_todo_list_en.html
deleted file mode 100644 (file)
index 933b762..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<div class="listtop">Overdue sales quotations and requests for quotations</div>
-
-<p>
- <table width="100%">
-  <tr>
-   <td class="listheading">Date</td>
-   <td class="listheading">Valid until</td>
-   <td class="listheading">Sales quotation / Request quotation</td>
-   <td class="listheading">Customer / Vendor</td>
-   <td class="listheading">Transaction description</td>
-   <td class="listheading">Amount</td>
-   <td class="listheading">Employee</td>
-  </tr>
-
-  [%- FOREACH row = QUOTATIONS %]
-  <tr class="listrow[% loop.count % 2 %]">
-   <td>[% HTML.escape(row.transdate) %]</td>
-   <td>[% HTML.escape(row.reqdate) %]</td>
-   <td>
-    <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
-     [% IF row.vc == 'customer' %]
-     Sales quotation
-     [% ELSE %]
-     Request quotation
-     [% END %]
-     [% HTML.escape(row.quonumber) %]
-    </a>
-   </td>
-   <td>
-    [% IF row.vc == 'customer' %]
-    [% HTML.escape(row.customer) %]
-    [% ELSE %]
-    [% HTML.escape(row.vendor) %]
-    [% END %]
-   </td>
-   <td>[% HTML.escape(row.transaction_description) %]</td>
-   <td>[% HTML.escape(LxERP.format_amount(row.amount, 2)) %]</td>
-   <td>[% HTML.escape(row.employee) %]</td>
-  </tr>
-  [%- END %]
- </table>
-</p>
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 (file)
index aba808b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-
-<div class="listtop"><translate>Overdue sales quotations and requests for quotations</translate></div>
-
-<p>
- <table width="100%">
-  <tr>
-   <td class="listheading"><translate>Date</translate></td>
-   <td class="listheading"><translate>Valid until</translate></td>
-   <td class="listheading"><translate>Sales quotation</translate> / <translate>Request quotation</translate></td>
-   <td class="listheading"><translate>Customer</translate> / <translate>Vendor</translate></td>
-   <td class="listheading"><translate>Transaction description</translate></td>
-   <td class="listheading"><translate>Amount</translate></td>
-   <td class="listheading"><translate>Employee</translate></td>
-  </tr>
-
-  [%- FOREACH row = QUOTATIONS %]
-  <tr class="listrow[% loop.count % 2 %]">
-   <td>[% HTML.escape(row.transdate) %]</td>
-   <td>[% HTML.escape(row.reqdate) %]</td>
-   <td>
-    <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
-     [% IF row.vc == 'customer' %]
-     <translate>Sales quotation</translate>
-     [% ELSE %]
-     <translate>Request quotation</translate>
-     [% END %]
-     [% HTML.escape(row.quonumber) %]
-    </a>
-   </td>
-   <td>
-    [% IF row.vc == 'customer' %]
-    [% HTML.escape(row.customer) %]
-    [% ELSE %]
-    [% HTML.escape(row.vendor) %]
-    [% END %]
-   </td>
-   <td>[% HTML.escape(row.transaction_description) %]</td>
-   <td>[% HTML.escape(LxERP.format_amount(row.amount, 2)) %]</td>
-   <td>[% HTML.escape(row.employee) %]</td>
-  </tr>
-  [%- END %]
- </table>
-</p>
diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
new file mode 100644 (file)
index 0000000..dcde83a
--- /dev/null
@@ -0,0 +1,33 @@
+[%- USE T8 %]
+[% USE HTML %]
+<tr>
+ <td>
+  <input type="button" id="cb_show_details" name="show_details" value='[% 'Show details' | $T8 %]'>
+  <script type="text/javascript">
+   $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
+  </script>
+  <table id='display_row' width="100%">
+   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
+    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]
+   </tr>
+
+   [% FOREACH row = ROWS %]
+     <tr valign="top" class="[% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">[% FOREACH row1 = row.ROW1 %]
+      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
+     </tr>
+
+     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
+     [% END %]
+
+     <tr class="listrow[% loop.count % 2 %]" id="[% loop.count %].row2" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
+      [% IF row2.line_break %]<br/>[% END %]
+      [% row2.value %][% END %]
+     </td></tr>
+   [% END %]
+
+  </table>
+ </td>
+</tr>
+<script type='text/javascript'>
+  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
+</script>
diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
deleted file mode 100644 (file)
index 1cd3a42..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-<tr>
- <td>
-  <input type="button" id="cb_show_details" name="show_details" value='Detailsanzeige'>
-  <script type="text/javascript">
-   $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
-  </script>
-  <table id='display_row' width="100%">
-   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
-    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]
-   </tr>
-
-   [% FOREACH row = ROWS %]
-     <tr valign="top" class="[% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">[% FOREACH row1 = row.ROW1 %]
-      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
-     </tr>
-
-     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
-     [% END %]
-
-     <tr class="listrow[% loop.count % 2 %]" id="[% loop.count %].row2" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
-      [% IF row2.line_break %]<br/>[% END %]
-      [% row2.value %][% END %]
-     </td></tr>
-   [% END %]
-
-  </table>
- </td>
-</tr>
-<script type='text/javascript'>
-  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
-</script>
diff --git a/templates/webpages/oe/sales_order_en.html b/templates/webpages/oe/sales_order_en.html
deleted file mode 100644 (file)
index ed2df70..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-<tr>
- <td>
-  <input type="button" id="cb_show_details" name="show_details" value='Show details'>
-  <script type="text/javascript">
-   $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
-  </script>
-  <table id='display_row' width="100%">
-   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
-    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]
-   </tr>
-
-   [% FOREACH row = ROWS %]
-     <tr valign="top" class="[% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">[% FOREACH row1 = row.ROW1 %]
-      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
-     </tr>
-
-     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
-     [% END %]
-
-     <tr class="listrow[% loop.count % 2 %]" id="[% loop.count %].row2" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
-      [% IF row2.line_break %]<br/>[% END %]
-      [% row2.value %][% END %]
-     </td></tr>
-   [% END %]
-
-  </table>
- </td>
-</tr>
-<script type='text/javascript'>
-  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
-</script>
diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
deleted file mode 100644 (file)
index 6072564..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[% USE HTML %]
-<tr>
- <td>
-  <input type="button" id="cb_show_details" name="show_details" value='<translate>Show details</translate>'>
-  <script type="text/javascript">
-   $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
-  </script>
-  <table id='display_row' width="100%">
-   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
-    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]
-   </tr>
-
-   [% FOREACH row = ROWS %]
-     <tr valign="top" class="[% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">[% FOREACH row1 = row.ROW1 %]
-      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
-     </tr>
-
-     [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
-     [% END %]
-
-     <tr class="listrow[% loop.count % 2 %]" id="[% loop.count %].row2" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
-      [% IF row2.line_break %]<br/>[% END %]
-      [% row2.value %][% END %]
-     </td></tr>
-   [% END %]
-
-  </table>
- </td>
-</tr>
-<script type='text/javascript'>
-  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
-</script>
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
new file mode 100644 (file)
index 0000000..90cb602
--- /dev/null
@@ -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') %]
+<body>
+
+<form method="post" action="oe.pl">
+
+ <p><div class="listtop">[% HTML.escape(title) %]</div></p>
+
+<table width="100%">
+ <tr>
+  <td>
+   <table>
+    <tr>
+     <th align="right">[% HTML.escape(vclabel) %]</th>
+     <td colspan="3">
+            [%- 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,
+                 -%]
+     </td>
+    </tr>
+[%- IF ALL_DEPARTMENTS.size %]
+    <tr>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+     <td colspan="3">
+            [%- 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,
+            -%]
+     </td>
+    </tr>
+[%- END %]
+    <tr>
+     <th align="right">[% HTML.escape(ordlabel) %]</th>
+     <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Employee' | $T8 %]</th>
+     <td>
+            [%- 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       = ' ',
+            -%]
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
+     <td>
+            [%- 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,
+            -%]
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
+     <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
+     <td colspan="3">
+            [%- 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,
+            -%]
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+     <td>
+      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
+      <input type="button" name="transdatefrom" id="trigger3" value="?">
+     </td>
+     <th align="right">[% 'Bis' | $T8 %]</th>
+     <td>
+      <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+     <td>
+      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input type=button name=reqdatefrom id="trigger5" value=?>
+     </td>
+     <th align="right">[% 'Bis' | $T8 %]</th>
+     <td>
+      <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
+     <td colspan="5">
+      <table>
+       <tr>
+        <td>
+         <input type="checkbox" name="open" value="1" id="open" checked>
+         <label for="open">[% 'Open' | $T8 %]</label>
+        </td>
+        <td>
+         <input type="checkbox" name="closed" value="1" id="closed">
+         <label for="closed">[% 'Closed' | $T8 %]</label>
+        </td>
+       </tr>
+[%- IF type == 'sales_order' OR type == 'purchase_order' %]
+       <tr>
+        <td>
+         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label>
+        </td>
+       </tr>
+[%- END %]
+       <tr>
+        <td>
+         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
+         <label for="l_id">[% 'ID' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_name">[% HTML.escape(vclabel) %]
+        </td>
+        <td>
+         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
+         <label for="l_netamount">[% 'Amount' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
+         <label for="l_tax">[% 'Tax' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_amount">[% 'Total' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
+         <label for="l_marge_total">[% 'Ertrag' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
+         <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
+         <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
+        </td>
+        <td>
+         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
+         <label for="l_country">[% 'Country' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
+         <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
+        </td>
+       </tr>
+[%- IF type == 'sales_order' %]
+       <tr><td colspan="3"><hr></td></tr>
+[%- END %]
+      </table>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</table>
+
+<script type="text/javascript">
+ <!--
+   Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
+   Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger4" });
+   Calendar.setup({ inputField : "reqdatefrom",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger5" });
+   Calendar.setup({ inputField : "reqdateto",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger6" });
+ //-->
+</script>
+
+<br>
+<input type="hidden" name="nextsub" value="orders">
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="type" value="[% HTML.escape(type) %]">
+<input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
deleted file mode 100644 (file)
index 20b38eb..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-[%- USE HTML %]
-[%- USE T8 %]
-[%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %]
-[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
-<body>
-
-<form method="post" action="oe.pl">
-
- <p><div class="listtop">[% HTML.escape(title) %]</div></p>
-
-<table width="100%">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <th align="right">[% HTML.escape(vclabel) %]</th>
-     <td colspan="3">
-            [%- 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,
-                 -%]
-     </td>
-    </tr>
-[%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap>Abteilung</th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-[%- END %]
-    <tr>
-     <th align="right">[% HTML.escape(ordlabel) %]</th>
-     <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right">Bearbeiter</th>
-     <td>
-            [%- 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       = ' ',
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">Verkäufer/in</th>
-     <td>
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">Vorgangsbezeichnung</th>
-     <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right">Projektnummer</th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom" id="trigger3" value="?">
-     </td>
-     <th align="right">bis</th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdatefrom id="trigger5" value=?>
-     </td>
-     <th align="right">bis</th>
-     <td>
-      <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
-     </td>
-    </tr>
-    <tr>
-     <th align="right">In Bericht aufnehmen</th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Offen</label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Geschlossen</label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' OR type == 'purchase_order' %]
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Nicht geliefert</label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Geliefert</label>
-        </td>
-       </tr>
-[%- END %]
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">Buchungsnummer</label>
-        </td>
-        <td>
-         <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Datum</label>
-        </td>
-        <td>
-         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% HTML.escape(vclabel) %]
-        </td>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Bearbeiter</label>
-        </td>
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Transportmittel</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
-         <label for="l_netamount">Betrag</label>
-        </td>
-        <td>
-         <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
-         <label for="l_tax">Steuer</label>
-        </td>
-        <td>
-         <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_amount">Summe</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_total">Ertrag</label>
-        </td>
-        <td>
-         <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_percent">Ertrag prozentual</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Projektnummer</label>
-        </td>
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Vorgangsbezeichnung</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-         <label for="l_subtotal">Zwischensumme</label>
-        </td>
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Verkäufer/in</label>
-        </td>
-       </tr>
-       <tr>
-        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
-        </td>
-        <td>
-         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
-         <label for="l_country">Land</label>
-        </td>
-        <td>
-         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
-         <label for="l_ustid">USt-IdNr.</label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' %]
-       <tr><td colspan="3"><hr></td></tr>
-[%- END %]
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<script type="text/javascript">
- <!--
-   Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-   Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger4" });
-   Calendar.setup({ inputField : "reqdatefrom",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger5" });
-   Calendar.setup({ inputField : "reqdateto",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger6" });
- //-->
-</script>
-
-<br>
-<input type="hidden" name="nextsub" value="orders">
-<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-<input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="Weiter">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/search_en.html b/templates/webpages/oe/search_en.html
deleted file mode 100644 (file)
index a4e1db7..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-[%- USE HTML %]
-[%- USE T8 %]
-[%- SET vclabel = vc == 'customer' ? 'Customer' : 'Vendor' %]
-[%- SET vcnumberlabel = vc == 'customer' ? 'Customer Number' : 'Vendor Number' %]
-<body>
-
-<form method="post" action="oe.pl">
-
- <p><div class="listtop">[% HTML.escape(title) %]</div></p>
-
-<table width="100%">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <th align="right">[% HTML.escape(vclabel) %]</th>
-     <td colspan="3">
-            [%- 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,
-                 -%]
-     </td>
-    </tr>
-[%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap>Department</th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-[%- END %]
-    <tr>
-     <th align="right">[% HTML.escape(ordlabel) %]</th>
-     <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right">Employee</th>
-     <td>
-            [%- 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       = ' ',
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">Salesman</th>
-     <td>
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">Transaction description</th>
-     <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right">Project Number</th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom" id="trigger3" value="?">
-     </td>
-     <th align="right">Bis</th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdatefrom id="trigger5" value=?>
-     </td>
-     <th align="right">Bis</th>
-     <td>
-      <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
-     </td>
-    </tr>
-    <tr>
-     <th align="right">Include in Report</th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Open</label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Closed</label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' OR type == 'purchase_order' %]
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Not delivered</label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Delivered</label>
-        </td>
-       </tr>
-[%- END %]
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">ID</label>
-        </td>
-        <td>
-         <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Date</label>
-        </td>
-        <td>
-         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% HTML.escape(vclabel) %]
-        </td>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Employee</label>
-        </td>
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Ship via</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
-         <label for="l_netamount">Amount</label>
-        </td>
-        <td>
-         <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
-         <label for="l_tax">Tax</label>
-        </td>
-        <td>
-         <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_amount">Total</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_total">Ertrag</label>
-        </td>
-        <td>
-         <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_percent">Ertrag prozentual</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Project Number</label>
-        </td>
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Transaction description</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-         <label for="l_subtotal">Subtotal</label>
-        </td>
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Salesman</label>
-        </td>
-       </tr>
-       <tr>
-        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
-        </td>
-        <td>
-         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
-         <label for="l_country">Country</label>
-        </td>
-        <td>
-         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
-         <label for="l_ustid">USt-IdNr.</label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' %]
-       <tr><td colspan="3"><hr></td></tr>
-[%- END %]
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<script type="text/javascript">
- <!--
-   Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-   Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger4" });
-   Calendar.setup({ inputField : "reqdatefrom",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger5" });
-   Calendar.setup({ inputField : "reqdateto",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger6" });
- //-->
-</script>
-
-<br>
-<input type="hidden" name="nextsub" value="orders">
-<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-<input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="Continue">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
deleted file mode 100644 (file)
index a21ddcb..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-[%- USE HTML %]
-[%- USE T8 %]
-[%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %]
-[%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %]
-<body>
-
-<form method="post" action="oe.pl">
-
- <p><div class="listtop">[% HTML.escape(title) %]</div></p>
-
-<table width="100%">
- <tr>
-  <td>
-   <table>
-    <tr>
-     <th align="right">[% HTML.escape(vclabel) %]</th>
-     <td colspan="3">
-            [%- 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,
-                 -%]
-     </td>
-    </tr>
-[%- IF ALL_DEPARTMENTS.size %]
-    <tr>
-     <th align="right" nowrap><translate>Department</translate></th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-[%- END %]
-    <tr>
-     <th align="right">[% HTML.escape(ordlabel) %]</th>
-     <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Employee</translate></th>
-     <td>
-            [%- 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       = ' ',
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Salesman</translate></th>
-     <td>
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Transaction description</translate></th>
-     <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Project Number</translate></th>
-     <td colspan="3">
-            [%- 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,
-            -%]
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdatefrom" id="trigger3" value="?">
-     </td>
-     <th align="right"><translate>Bis</translate></th>
-     <td>
-      <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
-     </td>
-    </tr>
-    <tr>
-     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
-     <td>
-      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdatefrom id="trigger5" value=?>
-     </td>
-     <th align="right"><translate>Bis</translate></th>
-     <td>
-      <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
-      <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
-     </td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Include in Report</translate></th>
-     <td colspan="5">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open"><translate>Open</translate></label>
-        </td>
-        <td>
-         <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed"><translate>Closed</translate></label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' OR type == 'purchase_order' %]
-       <tr>
-        <td>
-         <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered"><translate>Not delivered</translate></label>
-        </td>
-        <td>
-         <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered"><translate>Delivered</translate></label>
-        </td>
-       </tr>
-[%- END %]
-       <tr>
-        <td>
-         <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id"><translate>ID</translate></label>
-        </td>
-        <td>
-         <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate"><translate>Date</translate></label>
-        </td>
-        <td>
-         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% HTML.escape(vclabel) %]
-        </td>
-        <td>
-         <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee"><translate>Employee</translate></label>
-        </td>
-        <td>
-         <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia"><translate>Ship via</translate></label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
-         <label for="l_netamount"><translate>Amount</translate></label>
-        </td>
-        <td>
-         <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
-         <label for="l_tax"><translate>Tax</translate></label>
-        </td>
-        <td>
-         <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_amount"><translate>Total</translate></label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_total"><translate>Ertrag</translate></label>
-        </td>
-        <td>
-         <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_percent"><translate>Ertrag prozentual</translate></label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber"><translate>Project Number</translate></label>
-        </td>
-        <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description"><translate>Transaction description</translate></label>
-        </td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-         <label for="l_subtotal"><translate>Subtotal</translate></label>
-        </td>
-        <td>
-         <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman"><translate>Salesman</translate></label>
-        </td>
-       </tr>
-       <tr>
-        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
-       </tr>
-       <tr>
-        <td>
-         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
-        </td>
-        <td>
-         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
-         <label for="l_country"><translate>Country</translate></label>
-        </td>
-        <td>
-         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
-         <label for="l_ustid"><translate>USt-IdNr.</translate></label>
-        </td>
-       </tr>
-[%- IF type == 'sales_order' %]
-       <tr><td colspan="3"><hr></td></tr>
-[%- END %]
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<script type="text/javascript">
- <!--
-   Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
-   Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger4" });
-   Calendar.setup({ inputField : "reqdatefrom",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger5" });
-   Calendar.setup({ inputField : "reqdateto",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger6" });
- //-->
-</script>
-
-<br>
-<input type="hidden" name="nextsub" value="orders">
-<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
-<input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-</form>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/project_form.html b/templates/webpages/projects/project_form.html
new file mode 100644 (file)
index 0000000..c27a254
--- /dev/null
@@ -0,0 +1,102 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+
+ [%- IF message %]
+ <p>[% message %]</p>
+
+ <hr>
+ [%- END %]
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form method="post" action="projects.pl">
+
+  <input type="hidden" name="project.id" value="[% HTML.escape(project.id) %]">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="basic_data">[% 'Basic data' | $T8 %]</a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+
+   <div id="basic_data" class="tabcontent">
+
+    <table>
+     <tr>
+      <th align="right">[% 'Number' | $T8 %]</th>
+      <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">[% 'Description' | $T8 %]</th>
+      <td>
+       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
+       [%- IF rows > 1 %]
+       <textarea name="project.description" rows="rows" cols="60" style="width: 100%" wrap="soft">[% HTML.escape(project.description) %]</textarea>
+       [%- ELSE %]
+       <input name="project.description" size="60" value="[% HTML.escape(project.description) %]">
+       [%- END %]
+      </td>
+     </tr>
+
+     [%- IF project.id %]
+     <tr>
+      <th align="right">&nbsp;</th>
+      <td>
+       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">[% 'Active' | $T8 %]</label>
+       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">[% 'Inactive' | $T8 %]</label>
+      </td>
+     </tr>
+     [%- END %]
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   [%- IF CUSTOM_VARIABLES.size %]
+   <div id="custom_variables" class="tabcontent">
+
+    <p>
+     <table>
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      <tr>
+       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
+       <td valign="top">[% var.HTML_CODE %]</td>
+      </tr>
+      [%- END %]
+     </table>
+    </p>
+
+    <br style="clear: left" />
+   </div>
+   [%- END %]
+
+  </div>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+   [%- IF project.id %]
+   <input type="submit" class="submit" name="action" value="[% 'Save as new' | $T8 %]">
+   [%- IF project.orphaned %]
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+   [%- END %]
+   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+   [%- END %]
+  </p>
+ </form>
+
+ <script type="text/javascript">
+  <!--
+      var maintab = new ddtabcontent("maintab");
+      maintab.setpersist(true);
+      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
+      maintab.init();
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/projects/project_form_de.html b/templates/webpages/projects/project_form_de.html
deleted file mode 100644 (file)
index 7409d11..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF message %]
- <p>[% message %]</p>
-
- <hr>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="projects.pl">
-
-  <input type="hidden" name="project.id" value="[% HTML.escape(project.id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="basic_data">Basisdaten</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="basic_data" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Nummer</th>
-      <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Beschreibung</th>
-      <td>
-       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
-       [%- IF rows > 1 %]
-       <textarea name="project.description" rows="rows" cols="60" style="width: 100%" wrap="soft">[% HTML.escape(project.description) %]</textarea>
-       [%- ELSE %]
-       <input name="project.description" size="60" value="[% HTML.escape(project.description) %]">
-       [%- END %]
-      </td>
-     </tr>
-
-     [%- IF project.id %]
-     <tr>
-      <th align="right">&nbsp;</th>
-      <td>
-       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">Aktiv</label>
-       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">Inaktiv</label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
-   [%- IF project.id %]
-   <input type="submit" class="submit" name="action" value="als neu speichern">
-   [%- IF project.orphaned %]
-   <input type="submit" class="submit" name="action" value="Löschen">
-   [%- END %]
-   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="Historie">
-   [%- END %]
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/project_form_en.html b/templates/webpages/projects/project_form_en.html
deleted file mode 100644 (file)
index 74c4694..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF message %]
- <p>[% message %]</p>
-
- <hr>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="projects.pl">
-
-  <input type="hidden" name="project.id" value="[% HTML.escape(project.id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="basic_data">Basic data</a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Custom Variables</a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="basic_data" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right">Number</th>
-      <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">Description</th>
-      <td>
-       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
-       [%- IF rows > 1 %]
-       <textarea name="project.description" rows="rows" cols="60" style="width: 100%" wrap="soft">[% HTML.escape(project.description) %]</textarea>
-       [%- ELSE %]
-       <input name="project.description" size="60" value="[% HTML.escape(project.description) %]">
-       [%- END %]
-      </td>
-     </tr>
-
-     [%- IF project.id %]
-     <tr>
-      <th align="right">&nbsp;</th>
-      <td>
-       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">Active</label>
-       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">Inactive</label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Save">
-   [%- IF project.id %]
-   <input type="submit" class="submit" name="action" value="Save as new">
-   [%- IF project.orphaned %]
-   <input type="submit" class="submit" name="action" value="Delete">
-   [%- END %]
-   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="history">
-   [%- END %]
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/project_form_master.html b/templates/webpages/projects/project_form_master.html
deleted file mode 100644 (file)
index c9d51b7..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- IF message %]
- <p>[% message %]</p>
-
- <hr>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form method="post" action="projects.pl">
-
-  <input type="hidden" name="project.id" value="[% HTML.escape(project.id) %]">
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-
-  <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="basic_data"><translate>Basic data</translate></a></li>
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
-   [%- END %]
-  </ul>
-
-  <div class="tabcontentstyle">
-
-   <div id="basic_data" class="tabcontent">
-
-    <table>
-     <tr>
-      <th align="right"><translate>Number</translate></th>
-      <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right"><translate>Description</translate></th>
-      <td>
-       [%- SET rows = LxERP.numtextrows(project.description, 60) %]
-       [%- IF rows > 1 %]
-       <textarea name="project.description" rows="rows" cols="60" style="width: 100%" wrap="soft">[% HTML.escape(project.description) %]</textarea>
-       [%- ELSE %]
-       <input name="project.description" size="60" value="[% HTML.escape(project.description) %]">
-       [%- END %]
-      </td>
-     </tr>
-
-     [%- IF project.id %]
-     <tr>
-      <th align="right">&nbsp;</th>
-      <td>
-       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1"><translate>Active</translate></label>
-       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0"><translate>Inactive</translate></label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-
-    <br style="clear: left" />
-   </div>
-
-   [%- IF CUSTOM_VARIABLES.size %]
-   <div id="custom_variables" class="tabcontent">
-
-    <p>
-     <table>
-      [%- FOREACH var = CUSTOM_VARIABLES %]
-      <tr>
-       <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-       <td valign="top">[% var.HTML_CODE %]</td>
-      </tr>
-      [%- END %]
-     </table>
-    </p>
-
-    <br style="clear: left" />
-   </div>
-   [%- END %]
-
-  </div>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-   [%- IF project.id %]
-   <input type="submit" class="submit" name="action" value="<translate>Save as new</translate>">
-   [%- IF project.orphaned %]
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-   [%- END %]
-   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="<translate>history</translate>">
-   [%- END %]
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-      var maintab = new ddtabcontent("maintab");
-      maintab.setpersist(true);
-      maintab.setselectedClassTarget("link"); //"link" or "linkparent"
-      maintab.init();
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/search.html b/templates/webpages/projects/search.html
new file mode 100644 (file)
index 0000000..e7b030c
--- /dev/null
@@ -0,0 +1,70 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <form method="post" action="projects.pl">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right">[% 'Number' | $T8 %]</th>
+     <td><input name="filter.projectnumber" size="20"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Description' | $T8 %]</th>
+     <td><input name="filter.description" size="60"></td>
+    </tr>
+
+    [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+    <tr>
+     <th>[% 'Include in Report' | $T8 %]</th>
+     <td>
+      <table>
+       <tr>
+        <td>
+         <input type="radio" name="filter.active" id="active_active" value="active" checked>
+         <label for="active_active">[% 'Active' | $T8 %]</label>
+        </td>
+        <td>
+         <input type="radio" name="filter.active" id="active_inactive" value="inactive">
+         <label for="active_inactive">[% 'Inactive' | $T8 %]</label>
+        </td>
+        <td>
+         <input type="radio" name="filter.active" id="active_both" value="both">
+         <label for="active_both">[% 'Both' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input type="radio" name="filter.status" id="status_all" value="all" checked>
+         <label for="status_all">[% 'All' | $T8 %]</label>
+        </td>
+        <td>
+         <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
+         <label for="status_orphaned">[% 'Orphaned' | $T8 %]</label>
+        </td>
+       </tr>
+
+       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+
+      </table>
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <input type="hidden" name="nextsub" value="project_report">
+
+  <p>
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/projects/search_de.html b/templates/webpages/projects/search_de.html
deleted file mode 100644 (file)
index 40ed6ef..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-[% USE HTML %]<body>
-
- <form method="post" action="projects.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right">Nummer</th>
-     <td><input name="filter.projectnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Beschreibung</th>
-     <td><input name="filter.description" size="60"></td>
-    </tr>
-
-    [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-    <tr>
-     <th>In Bericht aufnehmen</th>
-     <td>
-      <table>
-       <tr>
-        <td>
-         <input type="radio" name="filter.active" id="active_active" value="active" checked>
-         <label for="active_active">Aktiv</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_inactive" value="inactive">
-         <label for="active_inactive">Inaktiv</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_both" value="both">
-         <label for="active_both">Beide</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="radio" name="filter.status" id="status_all" value="all" checked>
-         <label for="status_all">Alle</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
-         <label for="status_orphaned">Nie benutzt</label>
-        </td>
-       </tr>
-
-       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="project_report">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/search_en.html b/templates/webpages/projects/search_en.html
deleted file mode 100644 (file)
index 6e71300..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-[% USE HTML %]<body>
-
- <form method="post" action="projects.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right">Number</th>
-     <td><input name="filter.projectnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right">Description</th>
-     <td><input name="filter.description" size="60"></td>
-    </tr>
-
-    [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-    <tr>
-     <th>Include in Report</th>
-     <td>
-      <table>
-       <tr>
-        <td>
-         <input type="radio" name="filter.active" id="active_active" value="active" checked>
-         <label for="active_active">Active</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_inactive" value="inactive">
-         <label for="active_inactive">Inactive</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_both" value="both">
-         <label for="active_both">Both</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="radio" name="filter.status" id="status_all" value="all" checked>
-         <label for="status_all">All</label>
-        </td>
-        <td>
-         <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
-         <label for="status_orphaned">Orphaned</label>
-        </td>
-       </tr>
-
-       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="project_report">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/projects/search_master.html b/templates/webpages/projects/search_master.html
deleted file mode 100644 (file)
index c5925b9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-[% USE HTML %]<body>
-
- <form method="post" action="projects.pl">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right"><translate>Number</translate></th>
-     <td><input name="filter.projectnumber" size="20"></td>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Description</translate></th>
-     <td><input name="filter.description" size="60"></td>
-    </tr>
-
-    [% CUSTOM_VARIABLES_FILTER_CODE %]
-
-    <tr>
-     <th><translate>Include in Report</translate></th>
-     <td>
-      <table>
-       <tr>
-        <td>
-         <input type="radio" name="filter.active" id="active_active" value="active" checked>
-         <label for="active_active"><translate>Active</translate></label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_inactive" value="inactive">
-         <label for="active_inactive"><translate>Inactive</translate></label>
-        </td>
-        <td>
-         <input type="radio" name="filter.active" id="active_both" value="both">
-         <label for="active_both"><translate>Both</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="radio" name="filter.status" id="status_all" value="all" checked>
-         <label for="status_all"><translate>All</translate></label>
-        </td>
-        <td>
-         <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
-         <label for="status_orphaned"><translate>Orphaned</translate></label>
-        </td>
-       </tr>
-
-       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <input type="hidden" name="nextsub" value="project_report">
-
-  <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/report_generator/csv_export_options.html b/templates/webpages/report_generator/csv_export_options.html
new file mode 100644 (file)
index 0000000..ee7f442
--- /dev/null
@@ -0,0 +1,87 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <script type="text/javascript">
+  <!--
+      function submit_report_generator_form(nextsub) {
+        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+        document.report_generator_form.submit();
+      }
+
+    -->
+ </script>
+
+ <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
+
+ <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
+
+  [%- FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="report_generator_csv_options_set" value="1">
+  <input type="hidden" name="report_generator_dispatch_to" value="">
+  <input type="hidden" name="action" value="report_generator_dispatcher">
+
+  <table>
+   <tr>
+    <td align="right">[% 'Quote chararacter' | $T8 %]</td>
+    <td>
+     <select name="report_generator_csv_options_quote_char" style="width: 300px">
+      <option value="&quot;" selected>&quot;</option>
+      <option value="'">'</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Escape character' | $T8 %]</td>
+    <td>
+     <select name="report_generator_csv_options_escape_char" style="width: 300px">
+      <option value="QUOTE_CHAR" selected>[% 'Same as the quote character' | $T8 %]</option>
+      <option value="&quot;">&quot;</option>
+      <option value="'">'</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Separator chararacter' | $T8 %]</td>
+    <td>
+     <select name="report_generator_csv_options_sep_char" style="width: 300px">
+      <option value=";" selected>;</option>
+      <option value=",">,</option>
+      <option value=":">:</option>
+      <option value="TAB">TAB ([% 'The tabulator character' | $T8 %])</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Line endings' | $T8 %]</td>
+    <td>
+     <select name="report_generator_csv_options_eol_style" style="width: 300px">
+      <option value="DOS">DOS/Windows (CR/LF)</option>
+      <option value="Unix" selected>Unix (LF)</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
+    <td valign="top">
+     <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
+     <label for="report_generator_csv_options_headers">[% 'Include column headings' | $T8 %]</label>
+    </td>
+   </tr>
+
+  </table>
+
+  <p>
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
+  </p>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/report_generator/csv_export_options_de.html b/templates/webpages/report_generator/csv_export_options_de.html
deleted file mode 100644 (file)
index d0d51b1..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_csv_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right">Anf&uuml;hrungszeichen</td>
-    <td>
-     <select name="report_generator_csv_options_quote_char" style="width: 300px">
-      <option value="&quot;" selected>&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Escape-Zeichen</td>
-    <td>
-     <select name="report_generator_csv_options_escape_char" style="width: 300px">
-      <option value="QUOTE_CHAR" selected>Wie Anf&uuml;hrungszeichen</option>
-      <option value="&quot;">&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Feldtrennzeichen</td>
-    <td>
-     <select name="report_generator_csv_options_sep_char" style="width: 300px">
-      <option value=";" selected>;</option>
-      <option value=",">,</option>
-      <option value=":">:</option>
-      <option value="TAB">TAB (Das Tabulator-Symbol)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Zeilenumbr&uuml;che</td>
-    <td>
-     <select name="report_generator_csv_options_eol_style" style="width: 300px">
-      <option value="DOS">DOS/Windows (CR/LF)</option>
-      <option value="Unix" selected>Unix (LF)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top">Optionen:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
-     <label for="report_generator_csv_options_headers">Spalten&uuml;berschriften erzeugen</label>
-    </td>
-   </tr>
-
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Als CSV exportieren">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Zurück">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/report_generator/csv_export_options_en.html b/templates/webpages/report_generator/csv_export_options_en.html
deleted file mode 100644 (file)
index 0cbf072..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_csv_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right">Quote chararacter</td>
-    <td>
-     <select name="report_generator_csv_options_quote_char" style="width: 300px">
-      <option value="&quot;" selected>&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Escape character</td>
-    <td>
-     <select name="report_generator_csv_options_escape_char" style="width: 300px">
-      <option value="QUOTE_CHAR" selected>Same as the quote character</option>
-      <option value="&quot;">&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Separator chararacter</td>
-    <td>
-     <select name="report_generator_csv_options_sep_char" style="width: 300px">
-      <option value=";" selected>;</option>
-      <option value=",">,</option>
-      <option value=":">:</option>
-      <option value="TAB">TAB (The tabulator character)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Line endings</td>
-    <td>
-     <select name="report_generator_csv_options_eol_style" style="width: 300px">
-      <option value="DOS">DOS/Windows (CR/LF)</option>
-      <option value="Unix" selected>Unix (LF)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top">Options:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
-     <label for="report_generator_csv_options_headers">Include column headings</label>
-    </td>
-   </tr>
-
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Export as CSV">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Back">
-  </p>
-
- </form>
-</body>
-</html>
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 (file)
index a2f56ef..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_csv_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right"><translate>Quote chararacter</translate></td>
-    <td>
-     <select name="report_generator_csv_options_quote_char" style="width: 300px">
-      <option value="&quot;" selected>&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Escape character</translate></td>
-    <td>
-     <select name="report_generator_csv_options_escape_char" style="width: 300px">
-      <option value="QUOTE_CHAR" selected><translate>Same as the quote character</translate></option>
-      <option value="&quot;">&quot;</option>
-      <option value="'">'</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Separator chararacter</translate></td>
-    <td>
-     <select name="report_generator_csv_options_sep_char" style="width: 300px">
-      <option value=";" selected>;</option>
-      <option value=",">,</option>
-      <option value=":">:</option>
-      <option value="TAB">TAB (<translate>The tabulator character</translate>)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Line endings</translate></td>
-    <td>
-     <select name="report_generator_csv_options_eol_style" style="width: 300px">
-      <option value="DOS">DOS/Windows (CR/LF)</option>
-      <option value="Unix" selected>Unix (LF)</option>
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top"><translate>Options</translate>:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
-     <label for="report_generator_csv_options_headers"><translate>Include column headings</translate></label>
-    </td>
-   </tr>
-
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="<translate>Export as CSV</translate>">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="<translate>Back</translate>">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
new file mode 100644 (file)
index 0000000..fa8874c
--- /dev/null
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <script type="text/javascript">
+  <!--
+      function submit_report_generator_form(nextsub) {
+        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+        document.report_generator_form.submit();
+      }
+
+    -->
+ </script>
+
+ <style type="text/css">
+  <!--
+.top_border {
+  border-top: solid black;
+  border-width: 4px;
+}
+.bottom_border {
+  border-bottom: solid black;
+  border-width: 4px;
+}
+    -->
+ </style>
+
+ [% IF MESSAGE %]
+  <p>[% MESSAGE %]</p>
+ [% END %]
+
+ <div class="listtop" width="100%">[% TITLE %]</div>
+
+ [% IF TOP_INFO_TEXT %]
+  <p>[% TOP_INFO_TEXT %]</p>
+ [% END %]
+
+ [% RAW_TOP_INFO_TEXT %]
+
+ [% IF DATA_PRESENT %]
+ <p>
+  <table width="100%">
+   [%- FOREACH row = HEADER_ROWS %]
+   <tr>
+    [% FOREACH col = row %]
+     <th class="listheading"
+     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
+     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
+     >
+      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
+      [%- col.text -%]
+      [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
+      [%- IF col.link -%]</a>[%- END -%]
+     </th>
+    [% END %]
+   </tr>
+   [%- END %]
+
+   [% FOREACH row = ROWS %]
+    [% IF row.IS_CONTROL %]
+     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
+     [% ELSE %]
+     <tr class="listrow[% row.outer_idx_odd %]">
+      [%- FOREACH col = row.COLUMNS %]
+      <td[% IF col.align %] align="[% col.align %]"[% END %]
+         [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
+         [%- IF col.colspan && col.colspan > 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 %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]
+        [%- END %]
+       [%- END %]
+      </td>
+      [%- END %]
+     </tr>
+    [% END %]
+   [% END %]
+
+   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
+
+  </table>
+ </p>
+ [% ELSE %]
+  <p>[% 'No data was found.' | $T8 %]</p>
+ [% END %]
+
+ [% RAW_BOTTOM_INFO_TEXT %]
+
+ [% IF BOTTOM_INFO_TEXT %]
+  <p>[% BOTTOM_INFO_TEXT %]</p>
+ [% END %]
+
+ [% IF SHOW_EXPORT_BUTTONS %]
+  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
+   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
+   [% END %]
+
+   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
+   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
+   <input type="hidden" name="report_generator_dispatch_to" value="">
+   <input type="hidden" name="action" value="report_generator_dispatcher">
+
+   <p>
+    [% 'List export' | $T8 %]<br>
+    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">[% END %]
+    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">[% END %]
+   </p>
+  </form>
+ [% END %]
+
+</body>
diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
deleted file mode 100644 (file)
index 8547b28..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%">[% TITLE %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   [%- FOREACH row = HEADER_ROWS %]
-   <tr>
-    [% FOREACH col = row %]
-     <th class="listheading"
-     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
-     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
-     >
-      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
-      [%- col.text -%]
-      [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
-      [%- IF col.link -%]</a>[%- END -%]
-     </th>
-    [% END %]
-   </tr>
-   [%- END %]
-
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
-         [%- IF col.colspan && col.colspan > 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 %]<a href="[% cell_row.link %]">[%- END %]
-          [%- cell_row.data %]
-          [%- IF cell_row.link %]</a>[%- END %]
-         [%- END %]
-        [%- UNLESS iterator.last %]<br>[%- END %]
-        [%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p>Es wurden keine Daten gefunden.</p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    Export anzeigen<br>
-    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Als PDF exportieren">[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Als CSV exportieren">[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/report_generator/html_report_en.html b/templates/webpages/report_generator/html_report_en.html
deleted file mode 100644 (file)
index 424a6da..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%">[% TITLE %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   [%- FOREACH row = HEADER_ROWS %]
-   <tr>
-    [% FOREACH col = row %]
-     <th class="listheading"
-     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
-     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
-     >
-      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
-      [%- col.text -%]
-      [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
-      [%- IF col.link -%]</a>[%- END -%]
-     </th>
-    [% END %]
-   </tr>
-   [%- END %]
-
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
-         [%- IF col.colspan && col.colspan > 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 %]<a href="[% cell_row.link %]">[%- END %]
-          [%- cell_row.data %]
-          [%- IF cell_row.link %]</a>[%- END %]
-         [%- END %]
-        [%- UNLESS iterator.last %]<br>[%- END %]
-        [%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p>No data was found.</p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    List export<br>
-    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Export as PDF">[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Export as CSV">[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
deleted file mode 100644 (file)
index 707657c..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%">[% TITLE %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   [%- FOREACH row = HEADER_ROWS %]
-   <tr>
-    [% FOREACH col = row %]
-     <th class="listheading"
-     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
-     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
-     >
-      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
-      [%- col.text -%]
-      [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
-      [%- IF col.link -%]</a>[%- END -%]
-     </th>
-    [% END %]
-   </tr>
-   [%- END %]
-
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
-         [%- IF col.colspan && col.colspan > 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 %]<a href="[% cell_row.link %]">[%- END %]
-          [%- cell_row.data %]
-          [%- IF cell_row.link %]</a>[%- END %]
-         [%- END %]
-        [%- UNLESS iterator.last %]<br>[%- END %]
-        [%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p><translate>No data was found.</translate></p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    <translate>List export</translate><br>
-    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="<translate>Export as PDF</translate>">[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="<translate>Export as CSV</translate>">[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/report_generator/pdf_export_options.html b/templates/webpages/report_generator/pdf_export_options.html
new file mode 100644 (file)
index 0000000..41eb6c0
--- /dev/null
@@ -0,0 +1,144 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]<body>
+
+ [%- SET default_margin = LxERP.format_amount(1.5) %]
+
+ <script type="text/javascript">
+  <!--
+      function submit_report_generator_form(nextsub) {
+        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+        document.report_generator_form.submit();
+      }
+
+    -->
+ </script>
+
+ <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
+
+ <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
+
+  [%- FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="report_generator_pdf_options_set" value="1">
+  <input type="hidden" name="report_generator_dispatch_to" value="">
+  <input type="hidden" name="action" value="report_generator_dispatcher">
+
+  <table>
+   <tr>
+    <td align="right">[% 'Orientation' | $T8 %]</td>
+    <td>
+     <select name="report_generator_pdf_options_paper_size">
+      <option value="A3">A3</option>
+      <option value="A4" selected>A4</option>
+      <option value="A5">A5</option>
+      <option value="letter">Letter</option>
+      <option value="legal">Legal</option>
+     </select>
+     <select name="report_generator_pdf_options_orientation">
+      <option value="portrait">[% 'Portrait' | $T8 %]</option>
+      <option value="landscape" selected>[% 'Landscape' | $T8 %]</option>
+     </select>
+    </td>
+   </tr>
+
+   [%- IF ALLOW_FONT_SELECTION %]
+   <tr>
+    <td align="right">[% 'Font' | $T8 %]</td>
+    <td>
+     <select name="report_generator_pdf_options_font_name">
+      <option>Courier</option>
+      <option>Georgia</option>
+      <option>Helvetica</option>
+      <option>Times</option>
+      <option selected>Verdana</option>
+     </select>
+    </td>
+   </tr>
+   [%- END %]
+
+   <tr>
+    <td align="right">[% 'Font size' | $T8 %]</td>
+    <td>
+     <select name="report_generator_pdf_options_font_size">
+      <option>6</option>
+      <option selected>7</option>
+      <option>8</option>
+      <option>9</option>
+      <option>10</option>
+      <option>11</option>
+      <option>12</option>
+      <option>13</option>
+      <option>14</option>
+      <option>15</option>
+     </select>
+     &nbsp;
+     pt
+    </td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Margins' | $T8 %]:</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Top' | $T8 %]</td>
+    <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Left' | $T8 %]</td>
+    <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Bottom' | $T8 %]</td>
+    <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
+   </tr>
+
+   <tr>
+    <td align="right">[% 'Right' | $T8 %]</td>
+    <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
+   </tr>
+
+   <tr>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
+    <td valign="top">
+     <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
+     <label for="report_generator_pdf_options_number">[% 'Number pages' | $T8 %]</label>
+     [% IF ALL_PRINTERS.size %]
+      <br>
+      <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
+      <label for="report_generator_pdf_options_print">[% 'Print list' | $T8 %]</label>
+     [% END %]
+    </td>
+   </tr>
+
+   [% IF ALL_PRINTERS.size %]
+    <tr>
+     <td align="right">[% 'Printer' | $T8 %]</td>
+     <td>
+      <select name="report_generator_pdf_options_printer_id">
+       [%- FOREACH printer = ALL_PRINTERS %]
+       <option value="[% HTML.escape(printer.id) %]"[% IF printer.selected %] selected[% END %]>[% HTML.escape(printer.printer_description) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Copies' | $T8 %]</td>
+     <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
+    </tr>
+   [% END %]
+  </table>
+
+  <p>
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
+  </p>
+
+ </form>
+</body>
+</html>
diff --git a/templates/webpages/report_generator/pdf_export_options_de.html b/templates/webpages/report_generator/pdf_export_options_de.html
deleted file mode 100644 (file)
index ea22d1a..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- SET default_margin = LxERP.format_amount(1.5) %]
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_pdf_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right">Seitenformat</td>
-    <td>
-     <select name="report_generator_pdf_options_paper_size">
-      <option value="A3">A3</option>
-      <option value="A4" selected>A4</option>
-      <option value="A5">A5</option>
-      <option value="letter">Letter</option>
-      <option value="legal">Legal</option>
-     </select>
-     <select name="report_generator_pdf_options_orientation">
-      <option value="portrait">Hochformat</option>
-      <option value="landscape" selected>Querformat</option>
-     </select>
-    </td>
-   </tr>
-
-   [%- IF ALLOW_FONT_SELECTION %]
-   <tr>
-    <td align="right">Schriftart</td>
-    <td>
-     <select name="report_generator_pdf_options_font_name">
-      <option>Courier</option>
-      <option>Georgia</option>
-      <option>Helvetica</option>
-      <option>Times</option>
-      <option selected>Verdana</option>
-     </select>
-    </td>
-   </tr>
-   [%- END %]
-
-   <tr>
-    <td align="right">Schriftgr&ouml;&szlig;e</td>
-    <td>
-     <select name="report_generator_pdf_options_font_size">
-      <option>6</option>
-      <option selected>7</option>
-      <option>8</option>
-      <option>9</option>
-      <option>10</option>
-      <option>11</option>
-      <option>12</option>
-      <option>13</option>
-      <option>14</option>
-      <option>15</option>
-     </select>
-     &nbsp;
-     pt
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Seitenr&auml;nder:</td>
-   </tr>
-
-   <tr>
-    <td align="right">Oben</td>
-    <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Links</td>
-    <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Unten</td>
-    <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Rechts</td>
-    <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top">Optionen:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
-     <label for="report_generator_pdf_options_number">Seiten nummerieren</label>
-     [% IF ALL_PRINTERS.size %]
-      <br>
-      <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
-      <label for="report_generator_pdf_options_print">Liste ausdrucken</label>
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF ALL_PRINTERS.size %]
-    <tr>
-     <td align="right">Drucker</td>
-     <td>
-      <select name="report_generator_pdf_options_printer_id">
-       [%- FOREACH printer = ALL_PRINTERS %]
-       <option value="[% HTML.escape(printer.id) %]"[% IF printer.selected %] selected[% END %]>[% HTML.escape(printer.printer_description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Kopien</td>
-     <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
-    </tr>
-   [% END %]
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Als PDF exportieren">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Zurück">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/report_generator/pdf_export_options_en.html b/templates/webpages/report_generator/pdf_export_options_en.html
deleted file mode 100644 (file)
index 26f092b..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- SET default_margin = LxERP.format_amount(1.5) %]
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_pdf_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right">Orientation</td>
-    <td>
-     <select name="report_generator_pdf_options_paper_size">
-      <option value="A3">A3</option>
-      <option value="A4" selected>A4</option>
-      <option value="A5">A5</option>
-      <option value="letter">Letter</option>
-      <option value="legal">Legal</option>
-     </select>
-     <select name="report_generator_pdf_options_orientation">
-      <option value="portrait">Portrait</option>
-      <option value="landscape" selected>Landscape</option>
-     </select>
-    </td>
-   </tr>
-
-   [%- IF ALLOW_FONT_SELECTION %]
-   <tr>
-    <td align="right">Font</td>
-    <td>
-     <select name="report_generator_pdf_options_font_name">
-      <option>Courier</option>
-      <option>Georgia</option>
-      <option>Helvetica</option>
-      <option>Times</option>
-      <option selected>Verdana</option>
-     </select>
-    </td>
-   </tr>
-   [%- END %]
-
-   <tr>
-    <td align="right">Font size</td>
-    <td>
-     <select name="report_generator_pdf_options_font_size">
-      <option>6</option>
-      <option selected>7</option>
-      <option>8</option>
-      <option>9</option>
-      <option>10</option>
-      <option>11</option>
-      <option>12</option>
-      <option>13</option>
-      <option>14</option>
-      <option>15</option>
-     </select>
-     &nbsp;
-     pt
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right">Margins:</td>
-   </tr>
-
-   <tr>
-    <td align="right">Top</td>
-    <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Left</td>
-    <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Bottom</td>
-    <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right">Right</td>
-    <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top">Options:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
-     <label for="report_generator_pdf_options_number">Number pages</label>
-     [% IF ALL_PRINTERS.size %]
-      <br>
-      <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
-      <label for="report_generator_pdf_options_print">Print list</label>
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF ALL_PRINTERS.size %]
-    <tr>
-     <td align="right">Printer</td>
-     <td>
-      <select name="report_generator_pdf_options_printer_id">
-       [%- FOREACH printer = ALL_PRINTERS %]
-       <option value="[% HTML.escape(printer.id) %]"[% IF printer.selected %] selected[% END %]>[% HTML.escape(printer.printer_description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Copies</td>
-     <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
-    </tr>
-   [% END %]
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Export as PDF">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Back">
-  </p>
-
- </form>
-</body>
-</html>
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 (file)
index b771698..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[% USE HTML %][% USE LxERP %]<body>
-
- [%- SET default_margin = LxERP.format_amount(1.5) %]
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <div class="listheading" width="100%">[% HTML.escape(title) %]</div>
-
- <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form">
-
-  [%- FOREACH var = HIDDEN %]
-  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="report_generator_pdf_options_set" value="1">
-  <input type="hidden" name="report_generator_dispatch_to" value="">
-  <input type="hidden" name="action" value="report_generator_dispatcher">
-
-  <table>
-   <tr>
-    <td align="right"><translate>Orientation</translate></td>
-    <td>
-     <select name="report_generator_pdf_options_paper_size">
-      <option value="A3">A3</option>
-      <option value="A4" selected>A4</option>
-      <option value="A5">A5</option>
-      <option value="letter">Letter</option>
-      <option value="legal">Legal</option>
-     </select>
-     <select name="report_generator_pdf_options_orientation">
-      <option value="portrait"><translate>Portrait</translate></option>
-      <option value="landscape" selected><translate>Landscape</translate></option>
-     </select>
-    </td>
-   </tr>
-
-   [%- IF ALLOW_FONT_SELECTION %]
-   <tr>
-    <td align="right"><translate>Font</translate></td>
-    <td>
-     <select name="report_generator_pdf_options_font_name">
-      <option>Courier</option>
-      <option>Georgia</option>
-      <option>Helvetica</option>
-      <option>Times</option>
-      <option selected>Verdana</option>
-     </select>
-    </td>
-   </tr>
-   [%- END %]
-
-   <tr>
-    <td align="right"><translate>Font size</translate></td>
-    <td>
-     <select name="report_generator_pdf_options_font_size">
-      <option>6</option>
-      <option selected>7</option>
-      <option>8</option>
-      <option>9</option>
-      <option>10</option>
-      <option>11</option>
-      <option>12</option>
-      <option>13</option>
-      <option>14</option>
-      <option>15</option>
-     </select>
-     &nbsp;
-     pt
-    </td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Margins</translate>:</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Top</translate></td>
-    <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Left</translate></td>
-    <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Bottom</translate></td>
-    <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right"><translate>Right</translate></td>
-    <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
-   </tr>
-
-   <tr>
-    <td align="right" valign="top"><translate>Options</translate>:</td>
-    <td valign="top">
-     <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
-     <label for="report_generator_pdf_options_number"><translate>Number pages</translate></label>
-     [% IF ALL_PRINTERS.size %]
-      <br>
-      <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
-      <label for="report_generator_pdf_options_print"><translate>Print list</translate></label>
-     [% END %]
-    </td>
-   </tr>
-
-   [% IF ALL_PRINTERS.size %]
-    <tr>
-     <td align="right"><translate>Printer</translate></td>
-     <td>
-      <select name="report_generator_pdf_options_printer_id">
-       [%- FOREACH printer = ALL_PRINTERS %]
-       <option value="[% HTML.escape(printer.id) %]"[% IF printer.selected %] selected[% END %]>[% HTML.escape(printer.printer_description) %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Copies</translate></td>
-     <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
-    </tr>
-   [% END %]
-  </table>
-
-  <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="<translate>Export as PDF</translate>">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="<translate>Back</translate>">
-  </p>
-
- </form>
-</body>
-</html>
diff --git a/templates/webpages/rp/aging_ar_bottom.html b/templates/webpages/rp/aging_ar_bottom.html
new file mode 100644 (file)
index 0000000..d148e22
--- /dev/null
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
+
+ [% PRINT_OPTIONS %]
+
+ <input type="hidden" name="todate" value="[% HTML.escape(todate) %]">
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+ <input type="hidden" name="arap" value="[% HTML.escape(arap) %]">
+ <input type="hidden" name="ct" value="[% HTML.escape(ct) %]">
+ <input type="hidden" name="customer" value="[% HTML.escape(customer) %]">
+ <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
+ <input type="hidden" name="department" value="[% HTML.escape(department) %]">
+
+ [% 'Statement' | $T8 %]
+ <br>
+ <input class="submit" type="submit" name="action" value="[% 'Select all' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+
+</form>
diff --git a/templates/webpages/rp/aging_ar_bottom_de.html b/templates/webpages/rp/aging_ar_bottom_de.html
deleted file mode 100644 (file)
index 57c9c8c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
-
- [% PRINT_OPTIONS %]
-
- <input type="hidden" name="todate" value="[% HTML.escape(todate) %]">
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
- <input type="hidden" name="arap" value="[% HTML.escape(arap) %]">
- <input type="hidden" name="ct" value="[% HTML.escape(ct) %]">
- <input type="hidden" name="customer" value="[% HTML.escape(customer) %]">
- <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
- <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-
- Sammelrechnung
- <br>
- <input class="submit" type="submit" name="action" value="Alle auswählen">
- <input class="submit" type="submit" name="action" value="Drucken">
- <input class="submit" type="submit" name="action" value="eMail">
-
-</form>
diff --git a/templates/webpages/rp/aging_ar_bottom_en.html b/templates/webpages/rp/aging_ar_bottom_en.html
deleted file mode 100644 (file)
index 3ddd62a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
-
- [% PRINT_OPTIONS %]
-
- <input type="hidden" name="todate" value="[% HTML.escape(todate) %]">
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
- <input type="hidden" name="arap" value="[% HTML.escape(arap) %]">
- <input type="hidden" name="ct" value="[% HTML.escape(ct) %]">
- <input type="hidden" name="customer" value="[% HTML.escape(customer) %]">
- <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
- <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-
- Statement
- <br>
- <input class="submit" type="submit" name="action" value="Select all">
- <input class="submit" type="submit" name="action" value="Print">
- <input class="submit" type="submit" name="action" value="E-mail">
-
-</form>
diff --git a/templates/webpages/rp/aging_ar_bottom_master.html b/templates/webpages/rp/aging_ar_bottom_master.html
deleted file mode 100644 (file)
index 94b2f58..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
-
- [% PRINT_OPTIONS %]
-
- <input type="hidden" name="todate" value="[% HTML.escape(todate) %]">
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
- <input type="hidden" name="arap" value="[% HTML.escape(arap) %]">
- <input type="hidden" name="ct" value="[% HTML.escape(ct) %]">
- <input type="hidden" name="customer" value="[% HTML.escape(customer) %]">
- <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
- <input type="hidden" name="department" value="[% HTML.escape(department) %]">
-
- <translate>Statement</translate>
- <br>
- <input class="submit" type="submit" name="action" value="<translate>Select all</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
- <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-
-</form>
diff --git a/templates/webpages/rp/aging_ar_top.html b/templates/webpages/rp/aging_ar_top.html
new file mode 100644 (file)
index 0000000..066ac98
--- /dev/null
@@ -0,0 +1 @@
+<form method="post" action="rp.pl">
diff --git a/templates/webpages/rp/aging_ar_top_de.html b/templates/webpages/rp/aging_ar_top_de.html
deleted file mode 100644 (file)
index 066ac98..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="rp.pl">
diff --git a/templates/webpages/rp/aging_ar_top_en.html b/templates/webpages/rp/aging_ar_top_en.html
deleted file mode 100644 (file)
index 066ac98..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="rp.pl">
diff --git a/templates/webpages/rp/aging_ar_top_master.html b/templates/webpages/rp/aging_ar_top_master.html
deleted file mode 100644 (file)
index 066ac98..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form method="post" action="rp.pl">
diff --git a/templates/webpages/rp/balance_sheet.html b/templates/webpages/rp/balance_sheet.html
new file mode 100644 (file)
index 0000000..1fd8d45
--- /dev/null
@@ -0,0 +1,118 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body bgcolor="#ffffff">
+
+<h2 align="center">
+[% company %]
+<br>[% address %]
+<p>[% 'BALANCE SHEET' | $T8 %]
+<br>[% period %]
+</h2>
+
+<table border="0">
+  <tr>
+    <th align="left" width="400" colspan="2">[% 'ASSETS' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
+    <th>[% this_period %]</th>
+    <th>[% last_period %]</th>
+  </tr>
+
+  [% FOREACH row = A %]
+  <tr>
+    <td> </td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
+    [%- END %]
+  </tr>
+  [% END %]
+
+[% IF l_subtotal %]
+  <tr>
+    <td colspan="2"> </td>
+    <td><hr noshade size="1"></td>
+    <td><hr noshade size="1"></td>
+  </tr>
+
+  <tr valign="top">
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %]</th>
+    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
+    [%- END %]
+  </tr>
+[% END %]
+
+  <tr>
+    <th align="left" colspan="4">[% 'LIABILITIES' | $T8 %]<b><hr align="left" width="250" size="5" noshade></th>
+  </tr>
+
+  [% FOREACH row = L %]
+  <tr>
+    <td></td>
+    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
+    [%- END %]
+  </tr>
+  [% END %]
+
+[% IF l_subtotal %]
+  <tr>
+    <td colspan="2"> </td>
+    <td><hr noshade size="1"></td>
+    <td><hr noshade size="1"></td>
+  </tr>
+
+  <tr valign="top">
+    <td></td>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
+    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
+    [%- END %]
+  </tr>
+[% END %]
+
+  <tr>
+    <th align="left" colspan="4">[% 'EQUITY' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
+  </tr>
+
+  [% FOREACH row = Q %]
+  <tr>
+    <td></td>
+    <td>[% row.description %]</td>
+    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
+    [%- END %]
+  </tr>
+  [% END  %]
+
+[% IF l_subtotal %]
+  <tr>
+    <td colspan="2"> </td>
+    <td><hr noshade size="1"></td>
+    <td><hr noshade size="1"></td>
+  </tr>
+
+  <tr valign="top">
+    <td></td>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
+    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
+    [%- END %]
+  </tr>
+[% END %]
+
+  <tr valign="top">
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] &amp; [% 'EQUITY' | $T8 %]</th>
+    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
+    [%- IF last_period %]
+    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
+    [%- END %]
+  </tr>
+</table>
diff --git a/templates/webpages/rp/balance_sheet_de.html b/templates/webpages/rp/balance_sheet_de.html
deleted file mode 100644 (file)
index 04ad441..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-[% company %]
-<br>[% address %]
-<p>BILANZ
-<br>[% period %]
-</h2>
-
-<table border="0">
-  <tr>
-    <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
-    <th>[% this_period %]</th>
-    <th>[% last_period %]</th>
-  </tr>
-
-  [% FOREACH row = A %]
-  <tr>
-    <td> </td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <th align="left" colspan="2">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = L %]
-  <tr>
-    <td></td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = Q %]
-  <tr>
-    <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END  %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr valign="top">
-    <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
-    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-</table>
diff --git a/templates/webpages/rp/balance_sheet_en.html b/templates/webpages/rp/balance_sheet_en.html
deleted file mode 100644 (file)
index ec47e65..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-[% company %]
-<br>[% address %]
-<p>BALANCE SHEET
-<br>[% period %]
-</h2>
-
-<table border="0">
-  <tr>
-    <th align="left" width="400" colspan="2">ASSETS<br><hr align="left" width="250" size="5" noshade></th>
-    <th>[% this_period %]</th>
-    <th>[% last_period %]</th>
-  </tr>
-
-  [% FOREACH row = A %]
-  <tr>
-    <td> </td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <th align="left" colspan="2">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4">LIABILITIES<b><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = L %]
-  <tr>
-    <td></td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4">EQUITY<br><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = Q %]
-  <tr>
-    <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END  %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left">TOTAL</th>
-    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr valign="top">
-    <th align="left" colspan="2">TOTAL LIABILITIES &amp; EQUITY</th>
-    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-</table>
diff --git a/templates/webpages/rp/balance_sheet_master.html b/templates/webpages/rp/balance_sheet_master.html
deleted file mode 100644 (file)
index fc3b8ee..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-[% company %]
-<br>[% address %]
-<p><translate>BALANCE SHEET</translate>
-<br>[% period %]
-</h2>
-
-<table border="0">
-  <tr>
-    <th align="left" width="400" colspan="2"><translate>ASSETS</translate><br><hr align="left" width="250" size="5" noshade></th>
-    <th>[% this_period %]</th>
-    <th>[% last_period %]</th>
-  </tr>
-
-  [% FOREACH row = A %]
-  <tr>
-    <td> </td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <th align="left" colspan="2"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4"><translate>LIABILITIES</translate><b><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = L %]
-  <tr>
-    <td></td>
-    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr>
-    <th align="left" colspan="4"><translate>EQUITY</translate><br><hr align="left" width="250" size="5" noshade></th>
-  </tr>
-
-  [% FOREACH row = Q %]
-  <tr>
-    <td></td>
-    <td>[% row.description %]</td>
-    <td align="right">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(row.last, decimalplaces) %]</td>
-    [%- END %]
-  </tr>
-  [% END  %]
-
-[% IF l_subtotal %]
-  <tr>
-    <td colspan="2"> </td>
-    <td><hr noshade size="1"></td>
-    <td><hr noshade size="1"></td>
-  </tr>
-
-  <tr valign="top">
-    <td></td>
-    <th align="left"><translate>TOTAL</translate></th>
-    <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
-    [%- END %]
-  </tr>
-[% END %]
-
-  <tr valign="top">
-    <th align="left" colspan="2"><translate>TOTAL</translate> <translate>LIABILITIES</translate> &amp; <translate>EQUITY</translate></th>
-    <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- IF last_period %]
-    <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
-    [%- END %]
-  </tr>
-</table>
diff --git a/templates/webpages/rp/html_report_susa.html b/templates/webpages/rp/html_report_susa.html
new file mode 100644 (file)
index 0000000..c9b010a
--- /dev/null
@@ -0,0 +1,121 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <script type="text/javascript">
+  <!--
+      function submit_report_generator_form(nextsub) {
+        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+        document.report_generator_form.submit();
+      }
+
+    -->
+ </script>
+
+ <style type="text/css">
+  <!--
+.top_border {
+  border-top: solid black;
+  border-width: 4px;
+}
+.bottom_border {
+  border-bottom: solid black;
+  border-width: 4px;
+}
+    -->
+ </style>
+
+ [% IF MESSAGE %]
+  <p>[% MESSAGE %]</p>
+ [% END %]
+
+ <div class="listtop" width="100%">[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</div>
+
+ [% IF TOP_INFO_TEXT %]
+  <p>[% TOP_INFO_TEXT %]</p>
+ [% END %]
+
+ [% RAW_TOP_INFO_TEXT %]
+
+ [% IF DATA_PRESENT %]
+ <p>
+  <table width="100%">
+   <tr>
+     <th class="listheading" rowspan=2>[% 'Account' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Description' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Last Transaction' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Starting Balance' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Sum for' | $T8 %] [% template_fromto %]</th>
+     <th class="listheading" colspan=2>[% 'Sum per' | $T8 %] [% template_to %]</th>
+     <th class="listheading" colspan=2>[% 'Saldo per' | $T8 %] [% template_to %]</th>
+   </tr>
+   <tr>
+    <th class="listheading">[% 'Assets' | $T8 %]</th>
+    <th class="listheading">[% 'Equity' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+   </tr>
+   [% FOREACH row = ROWS %]
+    [% IF row.IS_CONTROL %]
+     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
+     [% ELSE %]
+     <tr class="listrow[% row.outer_idx_odd %]">
+      [%- FOREACH col = row.COLUMNS %]
+      <td[% IF col.align %] align="[% col.align %]"[% END %]
+         [%- IF col.valign %] valign="[% col.valign %]"[%- 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 %][%- END %]
+       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+        [%- IF cell_row.data != '' %]
+         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+         [%- cell_row.data %]
+         [%- IF cell_row.link %]</a>[%- END %]
+        [%- END %]
+       [%- UNLESS iterator.last %]<br>[%- END %]
+       [%- END %]
+      </td>
+      [%- END %]
+     </tr>
+    [% END %]
+   [% END %]
+
+   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
+
+  </table>
+ </p>
+ [% ELSE %]
+  <p>[% 'No data was found.' | $T8 %]</p>
+ [% END %]
+
+ [% RAW_BOTTOM_INFO_TEXT %]
+
+ [% IF BOTTOM_INFO_TEXT %]
+  <p>[% BOTTOM_INFO_TEXT %]</p>
+ [% END %]
+
+ [% IF SHOW_EXPORT_BUTTONS %]
+  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
+   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
+   [% END %]
+
+   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
+   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
+   <input type="hidden" name="report_generator_dispatch_to" value="">
+   <input type="hidden" name="action" value="report_generator_dispatcher">
+
+   <p>
+    Listenexport<br>
+    [% IF ALLOW_PDF_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>[% END %]
+    [% IF ALLOW_CSV_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>[% END %]
+   </p>
+  </form>
+ [% END %]
+
+</body>
diff --git a/templates/webpages/rp/html_report_susa_de.html b/templates/webpages/rp/html_report_susa_de.html
deleted file mode 100644 (file)
index 386bc87..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%">Summen- und Saldenliste [% template_fromto %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   <tr>
-     <th class="listheading" rowspan=2>Konto</th>
-     <th class="listheading" rowspan=2>Beschreibung</th>
-     <th class="listheading" rowspan=2>Letzte Buchung</th>
-     <th class="listheading" colspan=2>Eröffnungsbilanzwerte</th>
-     <th class="listheading" colspan=2>Summe für [% template_fromto %]</th>
-     <th class="listheading" colspan=2>Summe per [% template_to %]</th>
-     <th class="listheading" colspan=2>Saldo per [% template_to %]</th>
-   </tr>
-   <tr>
-    <th class="listheading">Aktiva</th>
-    <th class="listheading">Passiva</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-   </tr>
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- 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 %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
-        [%- END %]
-       [%- UNLESS iterator.last %]<br>[%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p>Es wurden keine Daten gefunden.</p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    Listenexport<br>
-    [% IF ALLOW_PDF_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/rp/html_report_susa_en.html b/templates/webpages/rp/html_report_susa_en.html
deleted file mode 100644 (file)
index 0828899..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%">Summen- und Saldenliste [% template_fromto %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   <tr>
-     <th class="listheading" rowspan=2>Account</th>
-     <th class="listheading" rowspan=2>Description</th>
-     <th class="listheading" rowspan=2>Last Transaction</th>
-     <th class="listheading" colspan=2>Starting Balance</th>
-     <th class="listheading" colspan=2>Sum for [% template_fromto %]</th>
-     <th class="listheading" colspan=2>Sum per [% template_to %]</th>
-     <th class="listheading" colspan=2>Saldo per [% template_to %]</th>
-   </tr>
-   <tr>
-    <th class="listheading">Assets</th>
-    <th class="listheading">Equity</th>
-    <th class="listheading">Debit</th>
-    <th class="listheading">Credit</th>
-    <th class="listheading">Debit</th>
-    <th class="listheading">Credit</th>
-    <th class="listheading">Debit</th>
-    <th class="listheading">Credit</th>
-   </tr>
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- 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 %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
-        [%- END %]
-       [%- UNLESS iterator.last %]<br>[%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p>No data was found.</p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    Listenexport<br>
-    [% IF ALLOW_PDF_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/rp/html_report_susa_master.html b/templates/webpages/rp/html_report_susa_master.html
deleted file mode 100644 (file)
index 2671a82..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-[% USE HTML %]<body>
-
- <script type="text/javascript">
-  <!--
-      function submit_report_generator_form(nextsub) {
-        document.report_generator_form.report_generator_dispatch_to.value = nextsub;
-        document.report_generator_form.submit();
-      }
-
-    -->
- </script>
-
- <style type="text/css">
-  <!--
-.top_border {
-  border-top: solid black;
-  border-width: 4px;
-}
-.bottom_border {
-  border-bottom: solid black;
-  border-width: 4px;
-}
-    -->
- </style>
-
- [% IF MESSAGE %]
-  <p>[% MESSAGE %]</p>
- [% END %]
-
- <div class="listtop" width="100%"><translate>Summen- und Saldenliste</translate> [% template_fromto %]</div>
-
- [% IF TOP_INFO_TEXT %]
-  <p>[% TOP_INFO_TEXT %]</p>
- [% END %]
-
- [% RAW_TOP_INFO_TEXT %]
-
- [% IF DATA_PRESENT %]
- <p>
-  <table width="100%">
-   <tr>
-     <th class="listheading" rowspan=2><translate>Account</translate></th>
-     <th class="listheading" rowspan=2><translate>Description</translate></th>
-     <th class="listheading" rowspan=2><translate>Last Transaction</translate></th>
-     <th class="listheading" colspan=2><translate>Starting Balance</translate></th>
-     <th class="listheading" colspan=2><translate>Sum for</translate> [% template_fromto %]</th>
-     <th class="listheading" colspan=2><translate>Sum per</translate> [% template_to %]</th>
-     <th class="listheading" colspan=2><translate>Saldo per</translate> [% template_to %]</th>
-   </tr>
-   <tr>
-    <th class="listheading"><translate>Assets</translate></th>
-    <th class="listheading"><translate>Equity</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-   </tr>
-   [% FOREACH row = ROWS %]
-    [% IF row.IS_CONTROL %]
-     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
-     [% ELSE %]
-     <tr class="listrow[% row.outer_idx_odd %]">
-      [%- FOREACH col = row.COLUMNS %]
-      <td[% IF col.align %] align="[% col.align %]"[% END %]
-         [%- IF col.valign %] valign="[% col.valign %]"[%- 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 %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
-        [%- END %]
-       [%- UNLESS iterator.last %]<br>[%- END %]
-       [%- END %]
-      </td>
-      [%- END %]
-     </tr>
-    [% END %]
-   [% END %]
-
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
-  </table>
- </p>
- [% ELSE %]
-  <p><translate>No data was found.</translate></p>
- [% END %]
-
- [% RAW_BOTTOM_INFO_TEXT %]
-
- [% IF BOTTOM_INFO_TEXT %]
-  <p>[% BOTTOM_INFO_TEXT %]</p>
- [% END %]
-
- [% IF SHOW_EXPORT_BUTTONS %]
-  <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
-   [% END %]
-
-   <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
-   <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
-   <input type="hidden" name="report_generator_dispatch_to" value="">
-   <input type="hidden" name="action" value="report_generator_dispatcher">
-
-   <p>
-    Listenexport<br>
-    [% IF ALLOW_PDF_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>[% END %]
-   </p>
-  </form>
- [% END %]
-
-</body>
diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
new file mode 100644 (file)
index 0000000..4aa4ab9
--- /dev/null
@@ -0,0 +1,98 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form action="sepa.pl" method="post">
+  <p>
+   [% 'Please select the source bank account for the transfers:' | $T8 %]
+   <br>
+   [%- INCLUDE generic/multibox.html
+         name      = 'bank_account.id',
+         DATA      = BANK_ACCOUNTS,
+         id_key    = 'id',
+         label_sub = 'bank_account_label',
+   -%]
+  </p>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH invoice = INVOICES %]
+     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(invoice.id) %]">
+
+     <tr class="listrow[% loop.count % 2 %]">
+      <td align="center">
+       [%- IF invoice.vendor_bank_info_ok %]
+        <input type="checkbox" name="bank_transfers[].selected" value="1">
+       [%- END %]
+      </td>
+      <td>
+       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
+        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(invoice.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
+         [%- GET HTML.escape(invoice.vendorname);
+             SET previous_vendorname = invoice.vendorname;
+             IF !invoice.vendor_bank_info_ok;
+               GET ' <sup>(1)</sup>';
+               SET show_vendor_bank_info_footnote = '1';
+             END; -%]
+        </a>
+       [%- END -%]
+      </td>
+
+      <td>
+       <a href="[% IF invoice.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
+        [% HTML.escape(invoice.invnumber) %]
+       </a>
+      </td>
+
+      <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
+      <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
+      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.invnumber) %]"></td>
+      <td align="right">
+       <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
+      </td>
+     </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  [%- IF show_vendor_bank_info_footnote %]
+   <p>
+    <sup>(1)</sup> [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
+   </p>
+  [%- END %]
+
+  <p>
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Step 2' | $T8 %]">
+  </p>
+
+  <input type="hidden" name="action" value="dispatcher">
+ </form>
+
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <script type="text/javascript">
+  <!--
+    $(document).ready(function() {
+      $("#select_all").click(function() {
+        var checked = $(this).attr('checked');
+        $('INPUT[name="bank_transfers[].selected"]').each(function() {
+          $(this).attr('checked', checked);
+        });
+      });
+    });
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_add_de.html b/templates/webpages/sepa/bank_transfer_add_de.html
deleted file mode 100644 (file)
index d8257f5..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   Bitte wählen Sie das Bankkonto als Quelle für die Überweisungen aus:
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">Rechnung</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading" align="right">offener Betrag</th>
-     <th class="listheading">Verwendungszweck</th>
-     <th class="listheading" align="right">Überweisungssumme</th>
-    </tr>
-
-    [%- FOREACH invoice = INVOICES %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(invoice.id) %]">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td align="center">
-       [%- IF invoice.vendor_bank_info_ok %]
-        <input type="checkbox" name="bank_transfers[].selected" value="1">
-       [%- END %]
-      </td>
-      <td>
-       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(invoice.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(invoice.vendorname);
-             SET previous_vendorname = invoice.vendorname;
-             IF !invoice.vendor_bank_info_ok;
-               GET ' <sup>(1)</sup>';
-               SET show_vendor_bank_info_footnote = '1';
-             END; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF invoice.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
-        [% HTML.escape(invoice.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.invnumber) %]"></td>
-      <td align="right">
-       <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  [%- IF show_vendor_bank_info_footnote %]
-   <p>
-    <sup>(1)</sup> Für diesen Lieferanten wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Überweisungen für den Lieferanten anlegen.
-   </p>
-  [%- END %]
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Schritt 2">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="bank_transfers[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_add_en.html b/templates/webpages/sepa/bank_transfer_add_en.html
deleted file mode 100644 (file)
index 296305f..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   Please select the source bank account for the transfers:
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading">Vendor</th>
-     <th class="listheading">Invoice</th>
-     <th class="listheading" align="right">Amount</th>
-     <th class="listheading" align="right">Open amount</th>
-     <th class="listheading">Purpose</th>
-     <th class="listheading" align="right">Bank transfer amount</th>
-    </tr>
-
-    [%- FOREACH invoice = INVOICES %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(invoice.id) %]">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td align="center">
-       [%- IF invoice.vendor_bank_info_ok %]
-        <input type="checkbox" name="bank_transfers[].selected" value="1">
-       [%- END %]
-      </td>
-      <td>
-       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(invoice.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(invoice.vendorname);
-             SET previous_vendorname = invoice.vendorname;
-             IF !invoice.vendor_bank_info_ok;
-               GET ' <sup>(1)</sup>';
-               SET show_vendor_bank_info_footnote = '1';
-             END; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF invoice.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
-        [% HTML.escape(invoice.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.invnumber) %]"></td>
-      <td align="right">
-       <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  [%- IF show_vendor_bank_info_footnote %]
-   <p>
-    <sup>(1)</sup> No bank information has been entered in this vendor's master data entry. You cannot create bank transfers unless you enter bank information.
-   </p>
-  [%- END %]
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Step 2">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="bank_transfers[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_add_master.html b/templates/webpages/sepa/bank_transfer_add_master.html
deleted file mode 100644 (file)
index 30cc855..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   <translate>Please select the source bank account for the transfers:</translate>
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading" align="right"><translate>Open amount</translate></th>
-     <th class="listheading"><translate>Purpose</translate></th>
-     <th class="listheading" align="right"><translate>Bank transfer amount</translate></th>
-    </tr>
-
-    [%- FOREACH invoice = INVOICES %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(invoice.id) %]">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td align="center">
-       [%- IF invoice.vendor_bank_info_ok %]
-        <input type="checkbox" name="bank_transfers[].selected" value="1">
-       [%- END %]
-      </td>
-      <td>
-       [%- IF loop.first || (previous_vendorname != invoice.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(invoice.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(invoice.vendorname);
-             SET previous_vendorname = invoice.vendorname;
-             IF !invoice.vendor_bank_info_ok;
-               GET ' <sup>(1)</sup>';
-               SET show_vendor_bank_info_footnote = '1';
-             END; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF invoice.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
-        [% HTML.escape(invoice.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.invnumber) %]"></td>
-      <td align="right">
-       <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  [%- IF show_vendor_bank_info_footnote %]
-   <p>
-    <sup>(1)</sup> <translate>No bank information has been entered in
-     this vendor's master data entry. You cannot create bank transfers
-     unless you enter bank information.</translate>
-   </p>
-  [%- END %]
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="<translate>Step 2</translate>">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="bank_transfers[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html
new file mode 100644 (file)
index 0000000..318639e
--- /dev/null
@@ -0,0 +1,119 @@
+[%- USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<body>
+
+ [%- IF error_message %]
+ <p><div class="error_message">[% error_message %]</div></p>
+ [%- END %]
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form action="sepa.pl" method="post">
+  <p>1. [% 'Please select the source bank account for the transfers:' | $T8 %]
+   <br>
+   [%- INCLUDE generic/multibox.html
+         name      = 'bank_account.id',
+         DATA      = BANK_ACCOUNTS,
+         id_key    = 'id',
+         label_sub = 'bank_account_label',
+   -%]
+  </p>
+
+  <p>
+   2. [% 'Please Check the bank information for each vendor:' | $T8 %]
+   <br>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'Bank' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH vbi = VENDOR_BANK_INFO %]
+    <tr class="listrow[% loop.count % 1 %]">
+     <td>
+      <input type="hidden" name="vendor_bank_info[+].id" value="[% HTML.escape(vbi.id) %]">
+      <input type="hidden" name="vendor_bank_info[].name" value="[% HTML.escape(vbi.name) %]">
+      [% HTML.escape(vbi.name) %]
+     </td>
+     <td><input name="vendor_bank_info[].iban" size="20" value="[% HTML.escape(vbi.iban) %]"></td>
+     <td><input name="vendor_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic) %]"></td>
+     <td><input name="vendor_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
+    </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  <p>
+   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
+   <br>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
+     <th class="listheading">[% 'Execution date' | $T8 %]</th>
+    </tr>
+
+    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
+     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(bank_transfer.id) %]">
+     <input type="hidden" name="bank_transfers[].vendor_id" value="[% HTML.escape(bank_transfer.vendor_id) %]">
+     <input type="hidden" name="bank_transfers[].selected" value="1">
+
+     <tr class="listrow[% loop.count % 2 %]">
+      <td>
+       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
+        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(bank_transfer.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
+         [%- GET HTML.escape(bank_transfer.vendorname);
+             SET previous_vendorname = bank_transfer.vendorname; -%]
+        </a>
+       [%- END -%]
+      </td>
+
+      <td>
+       <a href="[% IF bank_transfer.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]">
+        [% HTML.escape(bank_transfer.invnumber) %]
+       </a>
+      </td>
+
+      <td align="right">[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
+      <td align="right">[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
+      <td><input name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference) %]"></td>
+      <td align="right"><input name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right"></td>
+      <td nowrap>
+       <input name="bank_transfers[].requested_execution_date"
+              id="requested_execution_date_[% loop.count %]"
+              value="[% HTML.escape(bank_transfer.requested_execution_date) %]"
+              size="11">
+       <input type="button" name="requested_execution_date_[% loop.count %]_trigger" id="requested_execution_date_[% loop.count %]_trigger" value="?">
+      </td>
+     </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Create bank transfer' | $T8 %]">
+  </p>
+
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="hidden" name="confirmation" value="1">
+ </form>
+
+ <script type="text/javascript">
+  <!--
+    [%- FOREACH row = BANK_TRANSFERS %]
+     Calendar.setup({ inputField : "requested_execution_date_[% loop.count %]",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "requested_execution_date_[% loop.count %]_trigger" });
+    [%- END %]
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_create_de.html b/templates/webpages/sepa/bank_transfer_create_de.html
deleted file mode 100644 (file)
index 18b4ae8..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- [%- IF error_message %]
- <p><div class="error_message">[% error_message %]</div></p>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>1. Bitte wählen Sie das Bankkonto als Quelle für die Überweisungen aus:
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   2. Bitte überprüfen Sie die Kontoinformationen der Lieferanten:
-   <br>
-   <table>
-    <tr>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">Bank</th>
-    </tr>
-
-    [%- FOREACH vbi = VENDOR_BANK_INFO %]
-    <tr class="listrow[% loop.count % 1 %]">
-     <td>
-      <input type="hidden" name="vendor_bank_info[+].id" value="[% HTML.escape(vbi.id) %]">
-      <input type="hidden" name="vendor_bank_info[].name" value="[% HTML.escape(vbi.name) %]">
-      [% HTML.escape(vbi.name) %]
-     </td>
-     <td><input name="vendor_bank_info[].iban" size="20" value="[% HTML.escape(vbi.iban) %]"></td>
-     <td><input name="vendor_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic) %]"></td>
-     <td><input name="vendor_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   3. Geben Sie das jeweils gewünschte Ausführungsdatum an, oder lassen Sie das Feld leer für die schnellstmögliche Ausführung:
-   <br>
-   <table>
-    <tr>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">Rechnung</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading" align="right">offener Betrag</th>
-     <th class="listheading">Verwendungszweck</th>
-     <th class="listheading" align="right">Überweisungssumme</th>
-     <th class="listheading">Ausführungsdatum</th>
-    </tr>
-
-    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(bank_transfer.id) %]">
-     <input type="hidden" name="bank_transfers[].vendor_id" value="[% HTML.escape(bank_transfer.vendor_id) %]">
-     <input type="hidden" name="bank_transfers[].selected" value="1">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td>
-       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(bank_transfer.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(bank_transfer.vendorname);
-             SET previous_vendorname = bank_transfer.vendorname; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF bank_transfer.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]">
-        [% HTML.escape(bank_transfer.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference) %]"></td>
-      <td align="right"><input name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right"></td>
-      <td nowrap>
-       <input name="bank_transfers[].requested_execution_date"
-              id="requested_execution_date_[% loop.count %]"
-              value="[% HTML.escape(bank_transfer.requested_execution_date) %]"
-              size="11">
-       <input type="button" name="requested_execution_date_[% loop.count %]_trigger" id="requested_execution_date_[% loop.count %]_trigger" value="?">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Überweisung erstellen">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="confirmation" value="1">
- </form>
-
- <script type="text/javascript">
-  <!--
-    [%- FOREACH row = BANK_TRANSFERS %]
-     Calendar.setup({ inputField : "requested_execution_date_[% loop.count %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "requested_execution_date_[% loop.count %]_trigger" });
-    [%- END %]
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_create_en.html b/templates/webpages/sepa/bank_transfer_create_en.html
deleted file mode 100644 (file)
index 97e52a9..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- [%- IF error_message %]
- <p><div class="error_message">[% error_message %]</div></p>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>1. Please select the source bank account for the transfers:
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   2. Please Check the bank information for each vendor:
-   <br>
-   <table>
-    <tr>
-     <th class="listheading">Vendor</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">Bank</th>
-    </tr>
-
-    [%- FOREACH vbi = VENDOR_BANK_INFO %]
-    <tr class="listrow[% loop.count % 1 %]">
-     <td>
-      <input type="hidden" name="vendor_bank_info[+].id" value="[% HTML.escape(vbi.id) %]">
-      <input type="hidden" name="vendor_bank_info[].name" value="[% HTML.escape(vbi.name) %]">
-      [% HTML.escape(vbi.name) %]
-     </td>
-     <td><input name="vendor_bank_info[].iban" size="20" value="[% HTML.escape(vbi.iban) %]"></td>
-     <td><input name="vendor_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic) %]"></td>
-     <td><input name="vendor_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   3. Enter the requested execution date or leave empty for the quickest possible execution:
-   <br>
-   <table>
-    <tr>
-     <th class="listheading">Vendor</th>
-     <th class="listheading">Invoice</th>
-     <th class="listheading" align="right">Amount</th>
-     <th class="listheading" align="right">Open amount</th>
-     <th class="listheading">Purpose</th>
-     <th class="listheading" align="right">Bank transfer amount</th>
-     <th class="listheading">Execution date</th>
-    </tr>
-
-    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(bank_transfer.id) %]">
-     <input type="hidden" name="bank_transfers[].vendor_id" value="[% HTML.escape(bank_transfer.vendor_id) %]">
-     <input type="hidden" name="bank_transfers[].selected" value="1">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td>
-       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(bank_transfer.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(bank_transfer.vendorname);
-             SET previous_vendorname = bank_transfer.vendorname; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF bank_transfer.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]">
-        [% HTML.escape(bank_transfer.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference) %]"></td>
-      <td align="right"><input name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right"></td>
-      <td nowrap>
-       <input name="bank_transfers[].requested_execution_date"
-              id="requested_execution_date_[% loop.count %]"
-              value="[% HTML.escape(bank_transfer.requested_execution_date) %]"
-              size="11">
-       <input type="button" name="requested_execution_date_[% loop.count %]_trigger" id="requested_execution_date_[% loop.count %]_trigger" value="?">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Create bank transfer">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="confirmation" value="1">
- </form>
-
- <script type="text/javascript">
-  <!--
-    [%- FOREACH row = BANK_TRANSFERS %]
-     Calendar.setup({ inputField : "requested_execution_date_[% loop.count %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "requested_execution_date_[% loop.count %]_trigger" });
-    [%- END %]
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_create_master.html b/templates/webpages/sepa/bank_transfer_create_master.html
deleted file mode 100644 (file)
index bfbaa2a..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-[% USE HTML %][% USE LxERP %]
-<body>
-
- [%- IF error_message %]
- <p><div class="error_message">[% error_message %]</div></p>
- [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>1. <translate>Please select the source bank account for the transfers:</translate>
-   <br>
-   [%- INCLUDE generic/multibox.html
-         name      = 'bank_account.id',
-         DATA      = BANK_ACCOUNTS,
-         id_key    = 'id',
-         label_sub = 'bank_account_label',
-   -%]
-  </p>
-
-  <p>
-   2. <translate>Please Check the bank information for each vendor:</translate>
-   <br>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
-     <th class="listheading"><translate>Bank</translate></th>
-    </tr>
-
-    [%- FOREACH vbi = VENDOR_BANK_INFO %]
-    <tr class="listrow[% loop.count % 1 %]">
-     <td>
-      <input type="hidden" name="vendor_bank_info[+].id" value="[% HTML.escape(vbi.id) %]">
-      <input type="hidden" name="vendor_bank_info[].name" value="[% HTML.escape(vbi.name) %]">
-      [% HTML.escape(vbi.name) %]
-     </td>
-     <td><input name="vendor_bank_info[].iban" size="20" value="[% HTML.escape(vbi.iban) %]"></td>
-     <td><input name="vendor_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic) %]"></td>
-     <td><input name="vendor_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
-    </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   3. <translate>Enter the requested execution date or leave empty for the quickest possible execution:</translate>
-   <br>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading" align="right"><translate>Open amount</translate></th>
-     <th class="listheading"><translate>Purpose</translate></th>
-     <th class="listheading" align="right"><translate>Bank transfer amount</translate></th>
-     <th class="listheading"><translate>Execution date</translate></th>
-    </tr>
-
-    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
-     <input type="hidden" name="bank_transfers[+].ap_id" value="[% HTML.escape(bank_transfer.id) %]">
-     <input type="hidden" name="bank_transfers[].vendor_id" value="[% HTML.escape(bank_transfer.vendor_id) %]">
-     <input type="hidden" name="bank_transfers[].selected" value="1">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td>
-       [%- IF loop.first || (previous_vendorname != bank_transfer.vendorname) %]
-        <a href="ct.pl?action=edit&db=vendor&id=[% HTML.url(bank_transfer.vendor_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add') %]">
-         [%- GET HTML.escape(bank_transfer.vendorname);
-             SET previous_vendorname = bank_transfer.vendorname; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF bank_transfer.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]">
-        [% HTML.escape(bank_transfer.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference) %]"></td>
-      <td align="right"><input name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right"></td>
-      <td nowrap>
-       <input name="bank_transfers[].requested_execution_date"
-              id="requested_execution_date_[% loop.count %]"
-              value="[% HTML.escape(bank_transfer.requested_execution_date) %]"
-              size="11">
-       <input type="button" name="requested_execution_date_[% loop.count %]_trigger" id="requested_execution_date_[% loop.count %]_trigger" value="?">
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="<translate>Create bank transfer</translate>">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
-  <input type="hidden" name="confirmation" value="1">
- </form>
-
- <script type="text/javascript">
-  <!--
-    [%- FOREACH row = BANK_TRANSFERS %]
-     Calendar.setup({ inputField : "requested_execution_date_[% loop.count %]",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "requested_execution_date_[% loop.count %]_trigger" });
-    [%- END %]
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_created.html b/templates/webpages/sepa/bank_transfer_created.html
new file mode 100644 (file)
index 0000000..d71ae55
--- /dev/null
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <p>
+  [% 'The SEPA export has been created.' | $T8 %]
+ </p>
+
+ <p>
+  <ul>
+   <li>
+    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
+     [% 'Download SEPA XML export file' | $T8 %]
+    </a>
+   </li>
+
+   <li>
+    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
+     [% 'List open SEPA exports' | $T8 %]
+    </a>
+   </li>
+  </ul>
+ </p>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_created_de.html b/templates/webpages/sepa/bank_transfer_created_de.html
deleted file mode 100644 (file)
index 1e8bcc4..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  Der SEPA-Export wurde erstellt
- </p>
-
- <p>
-  <ul>
-   <li>
-    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
-     SEPA-XML-Exportdatei herunterladen
-    </a>
-   </li>
-
-   <li>
-    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
-     Noch nicht ausgeführte SEPA-Exporte anzeigen
-    </a>
-   </li>
-  </ul>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_created_en.html b/templates/webpages/sepa/bank_transfer_created_en.html
deleted file mode 100644 (file)
index 808286f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  The SEPA export has been created.
- </p>
-
- <p>
-  <ul>
-   <li>
-    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
-     Download SEPA XML export file
-    </a>
-   </li>
-
-   <li>
-    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
-     List open SEPA exports
-    </a>
-   </li>
-  </ul>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_created_master.html b/templates/webpages/sepa/bank_transfer_created_master.html
deleted file mode 100644 (file)
index a782ada..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <p>
-  <translate>The SEPA export has been created.</translate>
- </p>
-
- <p>
-  <ul>
-   <li>
-    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
-     <translate>Download SEPA XML export file</translate>
-    </a>
-   </li>
-
-   <li>
-    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
-     <translate>List open SEPA exports</translate>
-    </a>
-   </li>
-  </ul>
- </p>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
new file mode 100644 (file)
index 0000000..28b17ed
--- /dev/null
@@ -0,0 +1,141 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<body>
+
+ <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
+
+ <form action="sepa.pl" method="post">
+  <input type="hidden" name="action" value="dispatcher">
+
+  <p>
+   <table>
+    <tr>
+     [%- IF show_post_payments_button %]
+      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
+     [%- END %]
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Target bank account' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading">[% 'Reference' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
+    </tr>
+    <tr>
+     <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     [%- IF show_post_payments_button %]
+      <th class="listheading" colspan="3">&nbsp;</th>
+      <th class="listheading">
+       <input name="set_all_execution_date" id="set_all_execution_date" size="11">
+       <input type="button" name="set_all_execution_date_trigger" id="set_all_execution_date_trigger" value="?">
+      </th>
+     [%- ELSE %]
+      <th class="listheading" colspan="4">&nbsp;</th>
+     [%- END %]
+    </tr>
+
+    [%- FOREACH item = export.items %]
+     <tr class="listrow[% loop.count % 2 %]">
+      [%- IF show_post_payments_button %]
+       <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
+       <input type="hidden" name="items[].sepa_export_id" value="[% HTML.escape(item.sepa_export_id) %]">
+       <td align="center">
+        [%- UNLESS item.executed %]
+        <input type="checkbox" name="items[].selected" value="1">
+        [%- END %]
+       </td>
+      [%- END %]
+      <td>
+       <a href="[% IF item.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&type=invoice&id=[% HTML.url(item.ap_id) %]">[% HTML.escape(item.invnumber) %]</a>
+      </td>
+      <td>[% HTML.escape(item.vendor_name) %]</td>
+      <td>[% HTML.escape(item.our_iban) %]</td>
+      <td>[% HTML.escape(item.our_bic) %]</td>
+      <td>[% HTML.escape(item.vendor_iban) %]</td>
+      <td>[% HTML.escape(item.vendor_bic) %]</td>
+      <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
+      <td>[% HTML.escape(item.reference) %]</td>
+      <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
+      <td align="right" nowrap>
+       [%- IF item.executed %]
+        [% HTML.escape(item.execution_date) %]
+       [%- ELSIF item.export_closed %]
+        [% 'not executed' | $T8 %]
+       [%- ELSE %]
+        <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
+               value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
+        <input type="button" name="execution_date_[% loop.count %]_trigger" id="execution_date_[% loop.count %]_trigger" value="?">
+       [%- END %]
+      </td>
+     </tr>
+    [%- END %]
+   </table>
+  </p>
+
+  <p><hr></p>
+
+  [%- IF show_post_payments_button %]
+  <p>
+   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="[% 'Post payments' | $T8 %]">
+  </p>
+
+  <script type="text/javascript" src="js/jquery.js"></script>
+  <script type="text/javascript">
+   <!--
+    function set_all_execution_date_fields() {
+      var new_date = $('#set_all_execution_date').attr('value');
+      $('INPUT[name="items[].execution_date"]').each(function() {
+        $(this).attr('value', new_date);
+      });
+    }
+
+    $(document).ready(function() {
+      $("#select_all").click(function() {
+        var checked = $(this).attr('checked');
+        $('INPUT[name="items[].selected"]').each(function() {
+          $(this).attr('checked', checked);
+        });
+      });
+
+      [%- IF show_post_payments_button %]
+       Calendar.setup({ inputField : "set_all_execution_date",
+                        ifFormat   : "[% myconfig_jsc_dateformat %]",
+                        align      : "BL",
+                        button     : "set_all_execution_date_trigger",
+                        onUpdate   : set_all_execution_date_fields });
+
+       [%- FOREACH item = export.items %]
+        [%- IF !item.executed %]
+         Calendar.setup({ inputField : "execution_date_[% loop.count %]",
+                          ifFormat   : "[% myconfig_jsc_dateformat %]",
+                          align      : "BL",
+                          button     : "execution_date_[% loop.count %]_trigger" });
+        [%- END %]
+       [%- END %]
+      [%- END %]
+    });
+     -->
+  </script>
+
+  [%- ELSE %]
+  <p>
+   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
+  </p>
+
+   [%- FOREACH item = export.items %]
+    [%- IF item.executed %]
+     <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
+     <input type="hidden" name="items[].export_id" value="[% HTML.escape(item.export_id) %]">
+    [%- END %]
+   [%- END %]
+  [%- END %]
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_edit_de.html b/templates/webpages/sepa/bank_transfer_edit_de.html
deleted file mode 100644 (file)
index ee43bd5..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <table>
-    <tr>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     [%- END %]
-     <th class="listheading">Rechnung</th>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading" colspan="2">Quellkonto</th>
-     <th class="listheading" colspan="2">Zielkonto</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading">Referenz</th>
-     <th class="listheading" align="right">Gewünschtes Ausführungsdatum</th>
-     <th class="listheading" align="right">Ausführungsdatum</th>
-    </tr>
-    <tr>
-     <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" colspan="3">&nbsp;</th>
-      <th class="listheading">
-       <input name="set_all_execution_date" id="set_all_execution_date" size="11">
-       <input type="button" name="set_all_execution_date_trigger" id="set_all_execution_date_trigger" value="?">
-      </th>
-     [%- ELSE %]
-      <th class="listheading" colspan="4">&nbsp;</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH item = export.items %]
-     <tr class="listrow[% loop.count % 2 %]">
-      [%- IF show_post_payments_button %]
-       <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-       <input type="hidden" name="items[].sepa_export_id" value="[% HTML.escape(item.sepa_export_id) %]">
-       <td align="center">
-        [%- UNLESS item.executed %]
-        <input type="checkbox" name="items[].selected" value="1">
-        [%- END %]
-       </td>
-      [%- END %]
-      <td>
-       <a href="[% IF item.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&type=invoice&id=[% HTML.url(item.ap_id) %]">[% HTML.escape(item.invnumber) %]</a>
-      </td>
-      <td>[% HTML.escape(item.vendor_name) %]</td>
-      <td>[% HTML.escape(item.our_iban) %]</td>
-      <td>[% HTML.escape(item.our_bic) %]</td>
-      <td>[% HTML.escape(item.vendor_iban) %]</td>
-      <td>[% HTML.escape(item.vendor_bic) %]</td>
-      <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
-      <td>[% HTML.escape(item.reference) %]</td>
-      <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
-      <td align="right" nowrap>
-       [%- IF item.executed %]
-        [% HTML.escape(item.execution_date) %]
-       [%- ELSIF item.export_closed %]
-        nicht ausgeführt
-       [%- ELSE %]
-        <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
-               value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
-        <input type="button" name="execution_date_[% loop.count %]_trigger" id="execution_date_[% loop.count %]_trigger" value="?">
-       [%- END %]
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p><hr></p>
-
-  [%- IF show_post_payments_button %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="Zahlungen buchen">
-  </p>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-    function set_all_execution_date_fields() {
-      var new_date = $('#set_all_execution_date').attr('value');
-      $('INPUT[name="items[].execution_date"]').each(function() {
-        $(this).attr('value', new_date);
-      });
-    }
-
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="items[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-
-      [%- IF show_post_payments_button %]
-       Calendar.setup({ inputField : "set_all_execution_date",
-                        ifFormat   : "[% myconfig_jsc_dateformat %]",
-                        align      : "BL",
-                        button     : "set_all_execution_date_trigger",
-                        onUpdate   : set_all_execution_date_fields });
-
-       [%- FOREACH item = export.items %]
-        [%- IF !item.executed %]
-         Calendar.setup({ inputField : "execution_date_[% loop.count %]",
-                          ifFormat   : "[% myconfig_jsc_dateformat %]",
-                          align      : "BL",
-                          button     : "execution_date_[% loop.count %]_trigger" });
-        [%- END %]
-       [%- END %]
-      [%- END %]
-    });
-     -->
-  </script>
-
-  [%- ELSE %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="Zahlungsliste als PDF">
-  </p>
-
-   [%- FOREACH item = export.items %]
-    [%- IF item.executed %]
-     <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-     <input type="hidden" name="items[].export_id" value="[% HTML.escape(item.export_id) %]">
-    [%- END %]
-   [%- END %]
-  [%- END %]
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_edit_en.html b/templates/webpages/sepa/bank_transfer_edit_en.html
deleted file mode 100644 (file)
index 2637584..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <table>
-    <tr>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     [%- END %]
-     <th class="listheading">Invoice</th>
-     <th class="listheading">Vendor</th>
-     <th class="listheading" colspan="2">Source bank account</th>
-     <th class="listheading" colspan="2">Target bank account</th>
-     <th class="listheading" align="right">Amount</th>
-     <th class="listheading">Reference</th>
-     <th class="listheading" align="right">Requested execution date</th>
-     <th class="listheading" align="right">Execution date</th>
-    </tr>
-    <tr>
-     <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" colspan="3">&nbsp;</th>
-      <th class="listheading">
-       <input name="set_all_execution_date" id="set_all_execution_date" size="11">
-       <input type="button" name="set_all_execution_date_trigger" id="set_all_execution_date_trigger" value="?">
-      </th>
-     [%- ELSE %]
-      <th class="listheading" colspan="4">&nbsp;</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH item = export.items %]
-     <tr class="listrow[% loop.count % 2 %]">
-      [%- IF show_post_payments_button %]
-       <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-       <input type="hidden" name="items[].sepa_export_id" value="[% HTML.escape(item.sepa_export_id) %]">
-       <td align="center">
-        [%- UNLESS item.executed %]
-        <input type="checkbox" name="items[].selected" value="1">
-        [%- END %]
-       </td>
-      [%- END %]
-      <td>
-       <a href="[% IF item.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&type=invoice&id=[% HTML.url(item.ap_id) %]">[% HTML.escape(item.invnumber) %]</a>
-      </td>
-      <td>[% HTML.escape(item.vendor_name) %]</td>
-      <td>[% HTML.escape(item.our_iban) %]</td>
-      <td>[% HTML.escape(item.our_bic) %]</td>
-      <td>[% HTML.escape(item.vendor_iban) %]</td>
-      <td>[% HTML.escape(item.vendor_bic) %]</td>
-      <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
-      <td>[% HTML.escape(item.reference) %]</td>
-      <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
-      <td align="right" nowrap>
-       [%- IF item.executed %]
-        [% HTML.escape(item.execution_date) %]
-       [%- ELSIF item.export_closed %]
-        not executed
-       [%- ELSE %]
-        <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
-               value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
-        <input type="button" name="execution_date_[% loop.count %]_trigger" id="execution_date_[% loop.count %]_trigger" value="?">
-       [%- END %]
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p><hr></p>
-
-  [%- IF show_post_payments_button %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="Post payments">
-  </p>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-    function set_all_execution_date_fields() {
-      var new_date = $('#set_all_execution_date').attr('value');
-      $('INPUT[name="items[].execution_date"]').each(function() {
-        $(this).attr('value', new_date);
-      });
-    }
-
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="items[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-
-      [%- IF show_post_payments_button %]
-       Calendar.setup({ inputField : "set_all_execution_date",
-                        ifFormat   : "[% myconfig_jsc_dateformat %]",
-                        align      : "BL",
-                        button     : "set_all_execution_date_trigger",
-                        onUpdate   : set_all_execution_date_fields });
-
-       [%- FOREACH item = export.items %]
-        [%- IF !item.executed %]
-         Calendar.setup({ inputField : "execution_date_[% loop.count %]",
-                          ifFormat   : "[% myconfig_jsc_dateformat %]",
-                          align      : "BL",
-                          button     : "execution_date_[% loop.count %]_trigger" });
-        [%- END %]
-       [%- END %]
-      [%- END %]
-    });
-     -->
-  </script>
-
-  [%- ELSE %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="Payment list as PDF">
-  </p>
-
-   [%- FOREACH item = export.items %]
-    [%- IF item.executed %]
-     <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-     <input type="hidden" name="items[].export_id" value="[% HTML.escape(item.export_id) %]">
-    [%- END %]
-   [%- END %]
-  [%- END %]
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_edit_master.html b/templates/webpages/sepa/bank_transfer_edit_master.html
deleted file mode 100644 (file)
index 5cfe88c..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-[% USE HTML %]
-[% USE LxERP %]
-<body>
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <input type="hidden" name="action" value="dispatcher">
-
-  <p>
-   <table>
-    <tr>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     [%- END %]
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading" colspan="2"><translate>Source bank account</translate></th>
-     <th class="listheading" colspan="2"><translate>Target bank account</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading"><translate>Reference</translate></th>
-     <th class="listheading" align="right"><translate>Requested execution date</translate></th>
-     <th class="listheading" align="right"><translate>Execution date</translate></th>
-    </tr>
-    <tr>
-     <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
-     [%- IF show_post_payments_button %]
-      <th class="listheading" colspan="3">&nbsp;</th>
-      <th class="listheading">
-       <input name="set_all_execution_date" id="set_all_execution_date" size="11">
-       <input type="button" name="set_all_execution_date_trigger" id="set_all_execution_date_trigger" value="?">
-      </th>
-     [%- ELSE %]
-      <th class="listheading" colspan="4">&nbsp;</th>
-     [%- END %]
-    </tr>
-
-    [%- FOREACH item = export.items %]
-     <tr class="listrow[% loop.count % 2 %]">
-      [%- IF show_post_payments_button %]
-       <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-       <input type="hidden" name="items[].sepa_export_id" value="[% HTML.escape(item.sepa_export_id) %]">
-       <td align="center">
-        [%- UNLESS item.executed %]
-        <input type="checkbox" name="items[].selected" value="1">
-        [%- END %]
-       </td>
-      [%- END %]
-      <td>
-       <a href="[% IF item.invoice %]ir[% ELSE %]ap[% END %].pl?action=edit&type=invoice&id=[% HTML.url(item.ap_id) %]">[% HTML.escape(item.invnumber) %]</a>
-      </td>
-      <td>[% HTML.escape(item.vendor_name) %]</td>
-      <td>[% HTML.escape(item.our_iban) %]</td>
-      <td>[% HTML.escape(item.our_bic) %]</td>
-      <td>[% HTML.escape(item.vendor_iban) %]</td>
-      <td>[% HTML.escape(item.vendor_bic) %]</td>
-      <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
-      <td>[% HTML.escape(item.reference) %]</td>
-      <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
-      <td align="right" nowrap>
-       [%- IF item.executed %]
-        [% HTML.escape(item.execution_date) %]
-       [%- ELSIF item.export_closed %]
-        <translate>not executed</translate>
-       [%- ELSE %]
-        <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
-               value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
-        <input type="button" name="execution_date_[% loop.count %]_trigger" id="execution_date_[% loop.count %]_trigger" value="?">
-       [%- END %]
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p><hr></p>
-
-  [%- IF show_post_payments_button %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="<translate>Post payments</translate>">
-  </p>
-
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript">
-   <!--
-    function set_all_execution_date_fields() {
-      var new_date = $('#set_all_execution_date').attr('value');
-      $('INPUT[name="items[].execution_date"]').each(function() {
-        $(this).attr('value', new_date);
-      });
-    }
-
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="items[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-
-      [%- IF show_post_payments_button %]
-       Calendar.setup({ inputField : "set_all_execution_date",
-                        ifFormat   : "[% myconfig_jsc_dateformat %]",
-                        align      : "BL",
-                        button     : "set_all_execution_date_trigger",
-                        onUpdate   : set_all_execution_date_fields });
-
-       [%- FOREACH item = export.items %]
-        [%- IF !item.executed %]
-         Calendar.setup({ inputField : "execution_date_[% loop.count %]",
-                          ifFormat   : "[% myconfig_jsc_dateformat %]",
-                          align      : "BL",
-                          button     : "execution_date_[% loop.count %]_trigger" });
-        [%- END %]
-       [%- END %]
-      [%- END %]
-    });
-     -->
-  </script>
-
-  [%- ELSE %]
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="<translate>Payment list as PDF</translate>">
-  </p>
-
-   [%- FOREACH item = export.items %]
-    [%- IF item.executed %]
-     <input type="hidden" name="items[+].id" value="[% HTML.escape(item.id) %]">
-     <input type="hidden" name="items[].export_id" value="[% HTML.escape(item.export_id) %]">
-    [%- END %]
-   [%- END %]
-  [%- END %]
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom.html b/templates/webpages/sepa/bank_transfer_list_bottom.html
new file mode 100644 (file)
index 0000000..79f373f
--- /dev/null
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[% USE HTML %]
+
+[%- IF show_buttons %]
+ <input type="hidden" name="action" value="dispatcher">
+ <input type="hidden" name="mode" value="multi">
+
+ <p>
+  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="[% 'SEPA XML download' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_edit" value="[% 'Post payments' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="[% 'Mark as closed' | $T8 %]">
+ </p>
+
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <script type="text/javascript">
+  <!--
+    $(document).ready(function() {
+      $("#select_all").click(function() {
+        var checked = $(this).attr('checked');
+        $('INPUT[name="exports[].selected"]').each(function() {
+          $(this).attr('checked', checked);
+        });
+      });
+    });
+    -->
+ </script>
+[%- END %]
+
+</form>
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom_de.html b/templates/webpages/sepa/bank_transfer_list_bottom_de.html
deleted file mode 100644 (file)
index c3c4298..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-
-[%- IF show_buttons %]
- <input type="hidden" name="action" value="dispatcher">
- <input type="hidden" name="mode" value="multi">
-
- <p>
-  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="SEPA-XML-Download">
-  <input type="submit" class="submit" name="action_bank_transfer_edit" value="Zahlungen buchen">
-  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="Abschließen">
- </p>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="exports[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-[%- END %]
-
-</form>
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom_en.html b/templates/webpages/sepa/bank_transfer_list_bottom_en.html
deleted file mode 100644 (file)
index 057d4b7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-
-[%- IF show_buttons %]
- <input type="hidden" name="action" value="dispatcher">
- <input type="hidden" name="mode" value="multi">
-
- <p>
-  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="SEPA XML download">
-  <input type="submit" class="submit" name="action_bank_transfer_edit" value="Post payments">
-  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="Mark as closed">
- </p>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="exports[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-[%- END %]
-
-</form>
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 (file)
index 2ddba09..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[% USE HTML %]
-
-[%- IF show_buttons %]
- <input type="hidden" name="action" value="dispatcher">
- <input type="hidden" name="mode" value="multi">
-
- <p>
-  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="<translate>SEPA XML download</translate>">
-  <input type="submit" class="submit" name="action_bank_transfer_edit" value="<translate>Post payments</translate>">
-  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="<translate>Mark as closed</translate>">
- </p>
-
- <script type="text/javascript" src="js/jquery.js"></script>
- <script type="text/javascript">
-  <!--
-    $(document).ready(function() {
-      $("#select_all").click(function() {
-        var checked = $(this).attr('checked');
-        $('INPUT[name="exports[].selected"]').each(function() {
-          $(this).attr('checked', checked);
-        });
-      });
-    });
-    -->
- </script>
-[%- END %]
-
-</form>
diff --git a/templates/webpages/sepa/bank_transfer_list_top.html b/templates/webpages/sepa/bank_transfer_list_top.html
new file mode 100644 (file)
index 0000000..f17b456
--- /dev/null
@@ -0,0 +1 @@
+<form action="sepa.pl" method="post">
diff --git a/templates/webpages/sepa/bank_transfer_list_top_de.html b/templates/webpages/sepa/bank_transfer_list_top_de.html
deleted file mode 100644 (file)
index f17b456..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form action="sepa.pl" method="post">
diff --git a/templates/webpages/sepa/bank_transfer_list_top_en.html b/templates/webpages/sepa/bank_transfer_list_top_en.html
deleted file mode 100644 (file)
index f17b456..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form action="sepa.pl" method="post">
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 (file)
index f17b456..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<form action="sepa.pl" method="post">
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 (file)
index 0000000..4d1a6dc
--- /dev/null
@@ -0,0 +1,30 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form action="sepa.pl" method="post">
+  <p>
+   [%- '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 %]
+  </p>
+
+  <p>
+   [% 'SEPA exports:' | $T8 %]
+   [%- FOREACH id = OPEN_EXPORT_IDS %]
+    [%- UNLESS loop.first %], [%- END %]
+    <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
+    <a href="sepa.pl?action=bank_transfer_edit&id=[% HTML.url(id) %]">[% HTML.escape(id) %]</a>
+   [%- END %]
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="[% 'Mark as closed' | $T8 %]">
+   <input type="button" class="submit" value="[% 'Back' | $T8 %]" onclick="history.back()">
+  </p>
+
+  <input type="hidden" name="action" value="dispatcher">
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html
deleted file mode 100644 (file)
index d18c53a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   Wollen Sie wirklich die folgenden SEPA-Exporte abschließen? Für Überweisungen, die noch nicht gebucht wurden, werden dann keine Zahlungen verbucht.
-  </p>
-
-  <p>
-   SEPA-Exporte:
-   [%- FOREACH id = OPEN_EXPORT_IDS %]
-    [%- UNLESS loop.first %], [%- END %]
-    <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
-    <a href="sepa.pl?action=bank_transfer_edit&id=[% HTML.url(id) %]">[% HTML.escape(id) %]</a>
-   [%- END %]
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="Abschließen">
-   <input type="button" class="submit" value="Zurück" onclick="history.back()">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_en.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_en.html
deleted file mode 100644 (file)
index 524965b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   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.
-  </p>
-
-  <p>
-   SEPA exports:
-   [%- FOREACH id = OPEN_EXPORT_IDS %]
-    [%- UNLESS loop.first %], [%- END %]
-    <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
-    <a href="sepa.pl?action=bank_transfer_edit&id=[% HTML.url(id) %]">[% HTML.escape(id) %]</a>
-   [%- END %]
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="Mark as closed">
-   <input type="button" class="submit" value="Back" onclick="history.back()">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
-</body>
-</html>
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 (file)
index f2c98a9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   <translate>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.</translate>
-  </p>
-
-  <p>
-   <translate>SEPA exports:</translate>
-   [%- FOREACH id = OPEN_EXPORT_IDS %]
-    [%- UNLESS loop.first %], [%- END %]
-    <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
-    <a href="sepa.pl?action=bank_transfer_edit&id=[% HTML.url(id) %]">[% HTML.escape(id) %]</a>
-   [%- END %]
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="<translate>Mark as closed</translate>">
-   <input type="button" class="submit" value="<translate>Back</translate>" onclick="history.back()">
-  </p>
-
-  <input type="hidden" name="action" value="dispatcher">
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html
new file mode 100644 (file)
index 0000000..306179f
--- /dev/null
@@ -0,0 +1,126 @@
+[%- USE T8 %]
+[% USE HTML %]
+<body>
+
+ <p><div class="listtop">[% title %]</div></p>
+
+ <form action="sepa.pl" method="post">
+  <p>
+   <table>
+    <tr>
+     <td align="right">[% 'Vendor' | $T8 %]</td>
+     <td><input name="f_vendor"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Invoice number' | $T8 %]</td>
+     <td><input name="f_invnumber"></td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Export date from' | $T8 %]</td>
+     <td>
+      <input name="f_export_date_from" id="f_export_date_from" size="11">
+      <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
+      [% 'to (time)' | $T8 %]
+      <input name="f_export_date_to" id="f_export_date_to" size="11">
+      <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Requested execution date from' | $T8 %]</td>
+     <td>
+      <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
+      <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
+      [% 'to (time)' | $T8 %]
+      <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
+      <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right">[% 'Execution date from' | $T8 %]</td>
+     <td>
+      <input name="f_execution_date_from" id="f_execution_date_from" size="11">
+      <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
+      [% 'to (time)' | $T8 %]
+      <input name="f_execution_date_to" id="f_execution_date_to" size="11">
+      <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <td align="right" valign="top">[% 'Include in Report' | $T8 %]</td>
+     <td valign="top">
+      <table>
+       <tr>
+        <td>
+         <input type="checkbox" name="l_open" id="l_open" value="1" checked>
+         <label for="l_open">[% 'open' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input type="checkbox" name="l_closed" id="l_closed" value="1">
+         <label for="l_closed">[% 'closed' | $T8 %]</label>
+        </td>
+       </tr>
+
+       <tr>
+        <td>
+         <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
+         <label for="l_not_executed">[% 'not yet executed' | $T8 %]</label>
+        </td>
+
+        <td>
+         <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
+         <label for="l_executed">[% 'executed' | $T8 %]</label>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="hidden" name="action" value="dispatcher">
+   <input type="submit" class="submit" name="action_bank_transfer_list" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+ <script type="text/javascript">
+  <!--
+     Calendar.setup({ inputField : "f_export_date_from",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_export_date_from_trigger" });
+     Calendar.setup({ inputField : "f_export_date_to",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_export_date_to_trigger" });
+
+     Calendar.setup({ inputField : "f_requested_execution_date_from",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_requested_execution_date_from_trigger" });
+     Calendar.setup({ inputField : "f_requested_execution_date_to",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_requested_execution_date_to_trigger" });
+
+     Calendar.setup({ inputField : "f_execution_date_from",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_execution_date_from_trigger" });
+     Calendar.setup({ inputField : "f_execution_date_to",
+                      ifFormat   : "[% myconfig_jsc_dateformat %]",
+                      align      : "BL",
+                      button     : "f_execution_date_to_trigger" });
+
+    -->
+ </script>
+
+</body>
+</html>
diff --git a/templates/webpages/sepa/bank_transfer_search_de.html b/templates/webpages/sepa/bank_transfer_search_de.html
deleted file mode 100644 (file)
index b53ddcb..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   <table>
-    <tr>
-     <td align="right">Lieferant</td>
-     <td><input name="f_vendor"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Rechnungsnummer</td>
-     <td><input name="f_invnumber"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Exportdatum von</td>
-     <td>
-      <input name="f_export_date_from" id="f_export_date_from" size="11">
-      <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
-      bis
-      <input name="f_export_date_to" id="f_export_date_to" size="11">
-      <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Gewünschtes Ausführungsdatum von</td>
-     <td>
-      <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
-      <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
-      bis
-      <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
-      <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Ausführungsdatum von</td>
-     <td>
-      <input name="f_execution_date_from" id="f_execution_date_from" size="11">
-      <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
-      bis
-      <input name="f_execution_date_to" id="f_execution_date_to" size="11">
-      <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right" valign="top">In Bericht aufnehmen</td>
-     <td valign="top">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open">Offen</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed">geschlossen</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed">Noch nicht ausgeführt</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed">ausgeführt</label>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_bank_transfer_list" value="Weiter">
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-     Calendar.setup({ inputField : "f_export_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_from_trigger" });
-     Calendar.setup({ inputField : "f_export_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_requested_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_requested_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_to_trigger" });
-
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_search_en.html b/templates/webpages/sepa/bank_transfer_search_en.html
deleted file mode 100644 (file)
index 9e8ca06..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   <table>
-    <tr>
-     <td align="right">Vendor</td>
-     <td><input name="f_vendor"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Invoice number</td>
-     <td><input name="f_invnumber"></td>
-    </tr>
-
-    <tr>
-     <td align="right">Export date from</td>
-     <td>
-      <input name="f_export_date_from" id="f_export_date_from" size="11">
-      <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
-      to (time)
-      <input name="f_export_date_to" id="f_export_date_to" size="11">
-      <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Requested execution date from</td>
-     <td>
-      <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
-      <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
-      to (time)
-      <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
-      <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right">Execution date from</td>
-     <td>
-      <input name="f_execution_date_from" id="f_execution_date_from" size="11">
-      <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
-      to (time)
-      <input name="f_execution_date_to" id="f_execution_date_to" size="11">
-      <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right" valign="top">Include in Report</td>
-     <td valign="top">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open">open</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed">closed</label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed">not yet executed</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed">executed</label>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_bank_transfer_list" value="Continue">
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-     Calendar.setup({ inputField : "f_export_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_from_trigger" });
-     Calendar.setup({ inputField : "f_export_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_requested_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_requested_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_to_trigger" });
-
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/sepa/bank_transfer_search_master.html b/templates/webpages/sepa/bank_transfer_search_master.html
deleted file mode 100644 (file)
index 8a4beb5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-[% USE HTML %]
-<body>
-
- <p><div class="listtop">[% title %]</div></p>
-
- <form action="sepa.pl" method="post">
-  <p>
-   <table>
-    <tr>
-     <td align="right"><translate>Vendor</translate></td>
-     <td><input name="f_vendor"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Invoice number</translate></td>
-     <td><input name="f_invnumber"></td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Export date from</translate></td>
-     <td>
-      <input name="f_export_date_from" id="f_export_date_from" size="11">
-      <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
-      <translate>to (time)</translate>
-      <input name="f_export_date_to" id="f_export_date_to" size="11">
-      <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Requested execution date from</translate></td>
-     <td>
-      <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
-      <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
-      <translate>to (time)</translate>
-      <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
-      <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right"><translate>Execution date from</translate></td>
-     <td>
-      <input name="f_execution_date_from" id="f_execution_date_from" size="11">
-      <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
-      <translate>to (time)</translate>
-      <input name="f_execution_date_to" id="f_execution_date_to" size="11">
-      <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <td align="right" valign="top"><translate>Include in Report</translate></td>
-     <td valign="top">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open"><translate>open</translate></label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed"><translate>closed</translate></label>
-        </td>
-       </tr>
-
-       <tr>
-        <td>
-         <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed"><translate>not yet executed</translate></label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed"><translate>executed</translate></label>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_bank_transfer_list" value="<translate>Continue</translate>">
-  </p>
- </form>
-
- <script type="text/javascript">
-  <!--
-     Calendar.setup({ inputField : "f_export_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_from_trigger" });
-     Calendar.setup({ inputField : "f_export_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_export_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_requested_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_requested_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_requested_execution_date_to_trigger" });
-
-     Calendar.setup({ inputField : "f_execution_date_from",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_from_trigger" });
-     Calendar.setup({ inputField : "f_execution_date_to",
-                      ifFormat   : "[% myconfig_jsc_dateformat %]",
-                      align      : "BL",
-                      button     : "f_execution_date_to_trigger" });
-
-    -->
- </script>
-
-</body>
-</html>
diff --git a/templates/webpages/todo/show_todo_list.html b/templates/webpages/todo/show_todo_list.html
new file mode 100644 (file)
index 0000000..8d6a137
--- /dev/null
@@ -0,0 +1,18 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+ <div class="listtop" style="margin-bottom: 10px">[% 'Your TODO list' | $T8 %]</div>
+
+ [%- IF !todo_list %]
+ <p>
+  [% 'There are no items on your TODO list at the moment.' | $T8 %]
+ </p>
+
+ [%- ELSE %]
+
+ [%- todo_list %]
+
+ [%- END %]
+
+</body>
+</html>
diff --git a/templates/webpages/todo/show_todo_list_de.html b/templates/webpages/todo/show_todo_list_de.html
deleted file mode 100644 (file)
index 8768e91..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" style="margin-bottom: 10px">Ihre Aufgabenliste</div>
-
- [%- IF !todo_list %]
- <p>
-  Ihre Aufgabenliste enth&auml;lt momentan keine Eintr&auml;ge.
- </p>
-
- [%- ELSE %]
-
- [%- todo_list %]
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/todo/show_todo_list_en.html b/templates/webpages/todo/show_todo_list_en.html
deleted file mode 100644 (file)
index cc138e6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" style="margin-bottom: 10px">Your TODO list</div>
-
- [%- IF !todo_list %]
- <p>
-  There are no items on your TODO list at the moment.
- </p>
-
- [%- ELSE %]
-
- [%- todo_list %]
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/todo/show_todo_list_master.html b/templates/webpages/todo/show_todo_list_master.html
deleted file mode 100644 (file)
index ebf0363..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[% USE HTML %]<body>
-
- <div class="listtop" style="margin-bottom: 10px"><translate>Your TODO list</translate></div>
-
- [%- IF !todo_list %]
- <p>
-  <translate>There are no items on your TODO list at the moment.</translate>
- </p>
-
- [%- ELSE %]
-
- [%- todo_list %]
-
- [%- END %]
-
-</body>
-</html>
diff --git a/templates/webpages/ustva/config_step1.html b/templates/webpages/ustva/config_step1.html
new file mode 100644 (file)
index 0000000..0d1a74a
--- /dev/null
@@ -0,0 +1,114 @@
+[%- USE T8 %]
+[% USE HTML %]<!--This file is autogenerated,
+ Edit templates/webpages/ustva/config_step1_master.html
+ and run locale/<cc>/locales.pl -->
+
+<body>
+<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
+<table width="100%">
+   <tr>
+      <th class="listtop">[% 'Tax Office Preferences' | $T8 %]</th>
+    </tr>
+    <tr>
+     <td>
+       <br />
+[%- IF COA_Germany %]
+       <fieldset>
+       <legend><b>[% 'Local Tax Office Preferences' | $T8 %]</b></legend>
+       <br />
+       [% select_tax_office %]
+       </fieldset>
+       <br />
+[%- END %]
+       <fieldset>
+       <legend><b>[% 'Taxation' | $T8 %]</b>
+       </legend>
+       <input name="method" id="accrual" class="radio" type="radio" value="accrual"
+         [% checked_accrual %]>
+       <label for="accrual">[% 'accrual' | $T8 %]</label>
+       <br>
+       <input name="method" id="cash" class="radio" type="radio" value="cash"
+         [% checked_cash %]>
+       <label for="cash">[% 'cash' | $T8 %]</label>
+       </fieldset>
+       <br>
+       <fieldset>
+       <legend><b>[% 'Tax Period' | $T8 %]</b>
+       </legend>
+
+
+           <input name=FA_voranmeld id=month class=radio type=radio value="month"
+             [% checked_monthly %]>
+           <label for="month">[% 'month' | $T8 %]</label>
+           <br>
+           <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
+             [% checked_quarterly %]>
+           <label for="quarter">[% 'quarter' | $T8 %]</label>
+           <br>
+           <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
+             [% checked_dauerfristverlaengerung %]>
+           <label for="">[% 'Extension Of Time' | $T8 %]</label>
+
+           </fieldset>
+           <br>
+           <fieldset>
+           <legend><b>[% 'Tax Consultant' | $T8 %]</b>
+           </legend>
+          <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
+             [% checked_kz_71 %]>
+           <label for="FA_71">[% 'Clearing Tax Received (No 71)' | $T8 %]
+    .      </label>
+           <br>
+           <br>-->
+           <table>
+           <tr>
+           <td>
+           [% 'Name' | $T8 %]
+           </td>
+           <td>
+           [% 'Street' | $T8 %]
+           </td>
+           <td>
+           [% 'Zip, City' | $T8 %]
+           </td>
+           <td>
+           [% 'Telephone' | $T8 %]
+           </td>
+           </tr>
+           <tr>
+           <td>
+           <input name="FA_steuerberater_name" id=steuerberater size=25
+             value="[% HTML.escape(FA_steuerberater_name) %]">
+           </td>
+           <td>
+           <input name="FA_steuerberater_street" id=steuerberater size=25
+             value="[% HTML.escape(FA_steuerberater_street) %]">
+           </td>
+           <td>
+           <input name="FA_steuerberater_city" id=steuerberater size=25
+             value="[% HTML.escape(FA_steuerberater_city) %]">
+           </td>
+           <td>
+           <input name="FA_steuerberater_tel" id=steuerberater size=25
+             value="[% HTML.escape(FA_steuerberater_tel) %]">
+           </tr>
+           </table>
+
+           </fieldset>
+
+           <br>
+           <br>
+           <hr>
+           <!--<input type=submit class=submit name=action value="
+           [% 'debug' | $T8 %]">-->
+           <input type=submit class=submit name=action
+             value="[% 'continue' | $T8 %]">
+         </td>
+       </tr>
+     </table>
+
+     [%- FOREACH var = hidden_variables %]
+       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+     [%- END %]
+  </form>
+</body>
diff --git a/templates/webpages/ustva/config_step1_de.html b/templates/webpages/ustva/config_step1_de.html
deleted file mode 100644 (file)
index aa14665..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step1_master.html
- and run locale/<cc>/locales.pl -->
-
-<body>
-<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
-<table width="100%">
-   <tr>
-      <th class="listtop">Finanzamt - Einstellungen</th>
-    </tr>
-    <tr>
-     <td>
-       <br />
-[%- IF COA_Germany %]
-       <fieldset>
-       <legend><b>Angaben zum Finanzamt</b></legend>
-       <br />
-       [% select_tax_office %]
-       </fieldset>
-       <br />
-[%- END %]
-       <fieldset>
-       <legend><b>Versteuerungs Verfahren</b>
-       </legend>
-       <input name="method" id="accrual" class="radio" type="radio" value="accrual"
-         [% checked_accrual %]>
-       <label for="accrual">Bilanzierung (Soll-Versteuerung)</label>
-       <br>
-       <input name="method" id="cash" class="radio" type="radio" value="cash"
-         [% checked_cash %]>
-       <label for="cash">E/Ü-Rechnung (Ist-Versteuerung)</label>
-       </fieldset>
-       <br>
-       <fieldset>
-       <legend><b>Voranmeldungszeitraum</b>
-       </legend>
-
-
-           <input name=FA_voranmeld id=month class=radio type=radio value="month"
-             [% checked_monthly %]>
-           <label for="month">Monatliche Abgabe</label>
-           <br>
-           <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
-             [% checked_quarterly %]>
-           <label for="quarter">Vierteljährliche (quartalsweise) Abgabe</label>
-           <br>
-           <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
-             [% checked_dauerfristverlaengerung %]>
-           <label for="">Dauerfristverlängerung</label>
-
-           </fieldset>
-           <br>
-           <fieldset>
-           <legend><b>Steuerberater/-in</b>
-           </legend>
-          <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
-             [% checked_kz_71 %]>
-           <label for="FA_71">Verrechnung des Erstattungsbetrages erwünscht (Zeile 71)
-    .      </label>
-           <br>
-           <br>-->
-           <table>
-           <tr>
-           <td>
-           Name
-           </td>
-           <td>
-           Straße
-           </td>
-           <td>
-           PLZ, Ort
-           </td>
-           <td>
-           Telefon
-           </td>
-           </tr>
-           <tr>
-           <td>
-           <input name="FA_steuerberater_name" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_name) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_street" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_street) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_city" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_city) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_tel" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_tel) %]">
-           </tr>
-           </table>
-
-           </fieldset>
-
-           <br>
-           <br>
-           <hr>
-           <!--<input type=submit class=submit name=action value="
-           Debug">-->
-           <input type=submit class=submit name=action
-             value="weiter">
-         </td>
-       </tr>
-     </table>
-
-     [%- FOREACH var = hidden_variables %]
-       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-     [%- END %]
-  </form>
-</body>
diff --git a/templates/webpages/ustva/config_step1_en.html b/templates/webpages/ustva/config_step1_en.html
deleted file mode 100644 (file)
index 6f7962b..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step1_master.html
- and run locale/<cc>/locales.pl -->
-
-<body>
-<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
-<table width="100%">
-   <tr>
-      <th class="listtop">Tax Office Preferences</th>
-    </tr>
-    <tr>
-     <td>
-       <br />
-[%- IF COA_Germany %]
-       <fieldset>
-       <legend><b>Local Tax Office Preferences</b></legend>
-       <br />
-       [% select_tax_office %]
-       </fieldset>
-       <br />
-[%- END %]
-       <fieldset>
-       <legend><b>Taxation</b>
-       </legend>
-       <input name="method" id="accrual" class="radio" type="radio" value="accrual"
-         [% checked_accrual %]>
-       <label for="accrual">accrual</label>
-       <br>
-       <input name="method" id="cash" class="radio" type="radio" value="cash"
-         [% checked_cash %]>
-       <label for="cash">cash</label>
-       </fieldset>
-       <br>
-       <fieldset>
-       <legend><b>Tax Period</b>
-       </legend>
-
-
-           <input name=FA_voranmeld id=month class=radio type=radio value="month"
-             [% checked_monthly %]>
-           <label for="month">month</label>
-           <br>
-           <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
-             [% checked_quarterly %]>
-           <label for="quarter">quarter</label>
-           <br>
-           <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
-             [% checked_dauerfristverlaengerung %]>
-           <label for="">Extension Of Time</label>
-
-           </fieldset>
-           <br>
-           <fieldset>
-           <legend><b>Tax Consultant</b>
-           </legend>
-          <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
-             [% checked_kz_71 %]>
-           <label for="FA_71">Clearing Tax Received (No 71)
-    .      </label>
-           <br>
-           <br>-->
-           <table>
-           <tr>
-           <td>
-           Name
-           </td>
-           <td>
-           Street
-           </td>
-           <td>
-           Zip, City
-           </td>
-           <td>
-           Telephone
-           </td>
-           </tr>
-           <tr>
-           <td>
-           <input name="FA_steuerberater_name" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_name) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_street" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_street) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_city" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_city) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_tel" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_tel) %]">
-           </tr>
-           </table>
-
-           </fieldset>
-
-           <br>
-           <br>
-           <hr>
-           <!--<input type=submit class=submit name=action value="
-           debug">-->
-           <input type=submit class=submit name=action
-             value="continue">
-         </td>
-       </tr>
-     </table>
-
-     [%- FOREACH var = hidden_variables %]
-       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-     [%- END %]
-  </form>
-</body>
diff --git a/templates/webpages/ustva/config_step1_master.html b/templates/webpages/ustva/config_step1_master.html
deleted file mode 100644 (file)
index 6b827b4..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step1_master.html
- and run locale/<cc>/locales.pl -->
-
-<body>
-<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
-<table width="100%">
-   <tr>
-      <th class="listtop"><translate>Tax Office Preferences</translate></th>
-    </tr>
-    <tr>
-     <td>
-       <br />
-[%- IF COA_Germany %]
-       <fieldset>
-       <legend><b><translate>Local Tax Office Preferences</translate></b></legend>
-       <br />
-       [% select_tax_office %]
-       </fieldset>
-       <br />
-[%- END %]
-       <fieldset>
-       <legend><b><translate>Taxation</translate></b>
-       </legend>
-       <input name="method" id="accrual" class="radio" type="radio" value="accrual"
-         [% checked_accrual %]>
-       <label for="accrual"><translate>accrual</translate></label>
-       <br>
-       <input name="method" id="cash" class="radio" type="radio" value="cash"
-         [% checked_cash %]>
-       <label for="cash"><translate>cash</translate></label>
-       </fieldset>
-       <br>
-       <fieldset>
-       <legend><b><translate>Tax Period</translate></b>
-       </legend>
-
-
-           <input name=FA_voranmeld id=month class=radio type=radio value="month"
-             [% checked_monthly %]>
-           <label for="month"><translate>month</translate></label>
-           <br>
-           <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
-             [% checked_quarterly %]>
-           <label for="quarter"><translate>quarter</translate></label>
-           <br>
-           <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
-             [% checked_dauerfristverlaengerung %]>
-           <label for=""><translate>Extension Of Time</translate></label>
-
-           </fieldset>
-           <br>
-           <fieldset>
-           <legend><b><translate>Tax Consultant</translate></b>
-           </legend>
-          <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
-             [% checked_kz_71 %]>
-           <label for="FA_71"><translate>Clearing Tax Received (No 71)</translate>
-    .      </label>
-           <br>
-           <br>-->
-           <table>
-           <tr>
-           <td>
-           <translate>Name</translate>
-           </td>
-           <td>
-           <translate>Street</translate>
-           </td>
-           <td>
-           <translate>Zip, City</translate>
-           </td>
-           <td>
-           <translate>Telephone</translate>
-           </td>
-           </tr>
-           <tr>
-           <td>
-           <input name="FA_steuerberater_name" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_name) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_street" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_street) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_city" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_city) %]">
-           </td>
-           <td>
-           <input name="FA_steuerberater_tel" id=steuerberater size=25
-             value="[% HTML.escape(FA_steuerberater_tel) %]">
-           </tr>
-           </table>
-
-           </fieldset>
-
-           <br>
-           <br>
-           <hr>
-           <!--<input type=submit class=submit name=action value="
-           <translate>debug</translate>">-->
-           <input type=submit class=submit name=action
-             value="<translate>continue</translate>">
-         </td>
-       </tr>
-     </table>
-
-     [%- FOREACH var = hidden_variables %]
-       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-     [%- END %]
-  </form>
-</body>
diff --git a/templates/webpages/ustva/config_step2.html b/templates/webpages/ustva/config_step2.html
new file mode 100644 (file)
index 0000000..9f4f79d
--- /dev/null
@@ -0,0 +1,215 @@
+[%- USE T8 %]
+[% USE HTML %]<!--This file is autogenerated,
+ Edit templates/webpages/ustva/config_step2_master.html
+ and run locale/<cc>/locales.pl -->
+
+
+<body>
+  <form name="elsterform" method="post" action="[% script %]">
+    <table width="100%">
+       <tr>
+         <th colspan="2" class="listtop">
+           [% 'Tax Office Preferences' | $T8 %]</th>
+       </tr>
+       <tr>
+         <td colspan=2>
+           <br>
+           <!-- Start Finanzamtdaten -->
+           <br>
+           <fieldset>
+             <legend>
+               <font size="+1">[% 'Tax Office' | $T8 %]
+               [% HTML.escape(FA_Name) %]</font>
+             </legend>
+             <table width="100%" valign="top">
+                <tr>
+                  <td valign="top">
+                    <br>
+                    <fieldset>
+                      <legend>
+                      <b>[% 'Address' | $T8 %]</b>
+                      </legend>
+                      <table width="100%">
+                        <tr>
+                          <td>
+                            [% 'Tax Office' | $T8 %]
+                          </td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <input name="FA_Name" size="40" title="FA_Name"
+                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
+                          <td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <input name="FA_Strasse" size="40" title="FA_Strasse"
+                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
+                          </td width="100%">
+                        </tr>
+                        <tr>
+                          <td width="116px">
+                            <input name="FA_PLZ" size="10" title="FA_PLZ"
+                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
+                          </td>
+                          <td>
+                            <input name="FA_Ort" size="20" title="FA_Ort"
+                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
+                          </td>
+                        </tr>
+                      </table>
+                    </fieldset>
+                    <br>
+                    <fieldset>
+                      <legend>
+                        <b>[% 'Contact' | $T8 %]</b>
+                      </legend>
+                        [% 'Telephone' | $T8 %]<br>
+                        <input name="FA_Telefon" size="40" title="FA_Telefon"
+                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
+                        <br>
+                        <br>
+                        [% 'Fax' | $T8 %]<br>
+                        <input name="FA_Fax" size="40" title="FA_Fax"
+                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
+                        <br>
+                        <br>
+                        [% 'Internet' | $T8 %]<br>
+                        <input name="FA_Email" size="40" title="FA_Email"
+                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
+                        <br>
+                        <br>
+                        <input name="FA_Internet" size="40" title="" title="FA_Internet"
+                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
+                        <br>
+                    </fieldset>
+                  </td>
+                  <td valign="top">
+                    <br>
+                    <fieldset>
+                    <legend>
+                    <b>[% 'Openings' | $T8 %]</b>
+                    </legend>
+                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
+                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
+                    </fieldset>
+                    <br>
+                      <fieldset>
+                      <legend>
+                        <b>[% 'Bank Connection Tax Office' | $T8 %]</b>
+                      <legend>
+                      <table>
+                      <tr>
+                        <td width="40%">
+                          [% 'Bank' | $T8 %]
+                          <br>
+                          <input name="FA_Bankbezeichnung_1" size="30"
+                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Account Nummer' | $T8 %]
+                          <br>
+                          <input name="FA_Kontonummer_1" size="15"
+                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Bank Code (long)' | $T8 %]
+                          <br>
+                          <input name="FA_BLZ_1" size="15"
+                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
+                        </td>
+                        <td width="40%">
+                          [% 'Bank' | $T8 %]
+                          <br>
+                          <input name="FA_Bankbezeichnung_oertlich" size="30"
+                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Account Nummer' | $T8 %]
+                          <br>
+                          <input name="FA_Kontonummer_2" size="15"
+                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Bank Code (long)' | $T8 %]
+                          <br>
+                          <input name="FA_BLZ_2" size="15"
+                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
+                        </td>
+                   </tr>
+             </table>
+           </fieldset>
+         </td>
+       </tr>
+    </table>
+  </fieldset>
+
+<!-- Stop Finanzamtdaten  -->
+
+        </td>
+       </tr>
+       <tr>
+         <td colspan="2">
+           <br>
+           <fieldset>
+           <legend>
+           <font size="+1">[% 'Tax Number' | $T8 %]</font>
+           </legend>
+           <br>
+[%- IF COA_Germany %]
+           [% input_steuernummer %]
+[%- ELSE %]
+[% 'Please enter the taxnumber in the administration menu user preferences' | $T8 %]
+[% 'Current value:' | $T8 %] [% HTML.escape(myconfig_taxnumber) %]
+[%- END %]
+
+
+           </H2><br>
+           </fieldset>
+           <br>
+           <br>
+           <hr>
+         </td>
+       </tr>
+       <tr>
+         <td align="left">
+
+          [%- IF callback %]
+           <input type="button" name="Verweis" value="[% 'User Config' | $T8 %]"
+            onClick="self.location.href='[% callback %]">
+          [%- ELSE %]
+            <input type="submit" class="submit" name="action" value="[% 'back' | $T8 %]">
+          [%- END %]
+
+          [%- IF warnung %]
+
+            <input type="hidden" name="nextsub" value="config_step2">
+            <input type="submit" class="submit" name="action"
+              value="[% 'continue' | $T8 %]">
+
+            <input type="hidden" name="saved" value="[% 'Check
+              Details' | $T8 %]">
+
+          [%- ELSE %]
+
+            <input type="hidden" name="nextsub" value="save">
+            <input type="hidden" name="filename" value="finanzamt.ini">
+            <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+
+          [%- END %]
+
+         </td>
+         <td align="right">
+           <H2 class="confirm">[%- saved %]</H2>
+         </td>
+      </tr>
+  </table>
+
+[%- FOREACH var = hidden_variables %]
+  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+[%- END %]
+
+
+  </form>
+</body>
+</html>
diff --git a/templates/webpages/ustva/config_step2_de.html b/templates/webpages/ustva/config_step2_de.html
deleted file mode 100644 (file)
index d6c5d1f..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step2_master.html
- and run locale/<cc>/locales.pl -->
-
-
-<body>
-  <form name="elsterform" method="post" action="[% script %]">
-    <table width="100%">
-       <tr>
-         <th colspan="2" class="listtop">
-           Finanzamt - Einstellungen</th>
-       </tr>
-       <tr>
-         <td colspan=2>
-           <br>
-           <!-- Start Finanzamtdaten -->
-           <br>
-           <fieldset>
-             <legend>
-               <font size="+1">Finanzamt
-               [% HTML.escape(FA_Name) %]</font>
-             </legend>
-             <table width="100%" valign="top">
-                <tr>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                      <legend>
-                      <b>Adresse</b>
-                      </legend>
-                      <table width="100%">
-                        <tr>
-                          <td>
-                            Finanzamt
-                          </td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Name" size="40" title="FA_Name"
-                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
-                          <td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Strasse" size="40" title="FA_Strasse"
-                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
-                          </td width="100%">
-                        </tr>
-                        <tr>
-                          <td width="116px">
-                            <input name="FA_PLZ" size="10" title="FA_PLZ"
-                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
-                          </td>
-                          <td>
-                            <input name="FA_Ort" size="20" title="FA_Ort"
-                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
-                          </td>
-                        </tr>
-                      </table>
-                    </fieldset>
-                    <br>
-                    <fieldset>
-                      <legend>
-                        <b>Kontakt</b>
-                      </legend>
-                        Telefon<br>
-                        <input name="FA_Telefon" size="40" title="FA_Telefon"
-                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        Fax<br>
-                        <input name="FA_Fax" size="40" title="FA_Fax"
-                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        Internet<br>
-                        <input name="FA_Email" size="40" title="FA_Email"
-                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        <input name="FA_Internet" size="40" title="" title="FA_Internet"
-                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
-                        <br>
-                    </fieldset>
-                  </td>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                    <legend>
-                    <b>Öffnungszeiten</b>
-                    </legend>
-                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
-                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
-                    </fieldset>
-                    <br>
-                      <fieldset>
-                      <legend>
-                        <b>Bankverbindung des Finanzamts</b>
-                      <legend>
-                      <table>
-                      <tr>
-                        <td width="40%">
-                          Bank
-                          <br>
-                          <input name="FA_Bankbezeichnung_1" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Kontonummer
-                          <br>
-                          <input name="FA_Kontonummer_1" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Bankleitzahl (BLZ)
-                          <br>
-                          <input name="FA_BLZ_1" size="15"
-                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
-                        </td>
-                        <td width="40%">
-                          Bank
-                          <br>
-                          <input name="FA_Bankbezeichnung_oertlich" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Kontonummer
-                          <br>
-                          <input name="FA_Kontonummer_2" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Bankleitzahl (BLZ)
-                          <br>
-                          <input name="FA_BLZ_2" size="15"
-                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
-                        </td>
-                   </tr>
-             </table>
-           </fieldset>
-         </td>
-       </tr>
-    </table>
-  </fieldset>
-
-<!-- Stop Finanzamtdaten  -->
-
-        </td>
-       </tr>
-       <tr>
-         <td colspan="2">
-           <br>
-           <fieldset>
-           <legend>
-           <font size="+1">Steuernummer</font>
-           </legend>
-           <br>
-[%- IF COA_Germany %]
-           [% input_steuernummer %]
-[%- ELSE %]
-Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul
-  angeben.
-Aktueller Wert: [% HTML.escape(myconfig_taxnumber) %]
-[%- END %]
-
-
-           </H2><br>
-           </fieldset>
-           <br>
-           <br>
-           <hr>
-         </td>
-       </tr>
-       <tr>
-         <td align="left">
-
-          [%- IF callback %]
-           <input type="button" name="Verweis" value="Benutzereinstellungen"
-            onClick="self.location.href='[% callback %]">
-          [%- ELSE %]
-            <input type="submit" class="submit" name="action" value="zurück">
-          [%- END %]
-
-          [%- IF warnung %]
-
-            <input type="hidden" name="nextsub" value="config_step2">
-            <input type="submit" class="submit" name="action"
-              value="weiter">
-
-            <input type="hidden" name="saved" value="Bitte Angaben überprüfen">
-
-          [%- ELSE %]
-
-            <input type="hidden" name="nextsub" value="save">
-            <input type="hidden" name="filename" value="finanzamt.ini">
-            <input type="submit" class="submit" name="action" value="Speichern">
-
-          [%- END %]
-
-         </td>
-         <td align="right">
-           <H2 class="confirm">[%- saved %]</H2>
-         </td>
-      </tr>
-  </table>
-
-[%- FOREACH var = hidden_variables %]
-  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-[%- END %]
-
-
-  </form>
-</body>
-</html>
diff --git a/templates/webpages/ustva/config_step2_en.html b/templates/webpages/ustva/config_step2_en.html
deleted file mode 100644 (file)
index 40e66a1..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step2_master.html
- and run locale/<cc>/locales.pl -->
-
-
-<body>
-  <form name="elsterform" method="post" action="[% script %]">
-    <table width="100%">
-       <tr>
-         <th colspan="2" class="listtop">
-           Tax Office Preferences</th>
-       </tr>
-       <tr>
-         <td colspan=2>
-           <br>
-           <!-- Start Finanzamtdaten -->
-           <br>
-           <fieldset>
-             <legend>
-               <font size="+1">Tax Office
-               [% HTML.escape(FA_Name) %]</font>
-             </legend>
-             <table width="100%" valign="top">
-                <tr>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                      <legend>
-                      <b>Address</b>
-                      </legend>
-                      <table width="100%">
-                        <tr>
-                          <td>
-                            Tax Office
-                          </td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Name" size="40" title="FA_Name"
-                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
-                          <td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Strasse" size="40" title="FA_Strasse"
-                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
-                          </td width="100%">
-                        </tr>
-                        <tr>
-                          <td width="116px">
-                            <input name="FA_PLZ" size="10" title="FA_PLZ"
-                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
-                          </td>
-                          <td>
-                            <input name="FA_Ort" size="20" title="FA_Ort"
-                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
-                          </td>
-                        </tr>
-                      </table>
-                    </fieldset>
-                    <br>
-                    <fieldset>
-                      <legend>
-                        <b>Contact</b>
-                      </legend>
-                        Telephone<br>
-                        <input name="FA_Telefon" size="40" title="FA_Telefon"
-                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        Fax<br>
-                        <input name="FA_Fax" size="40" title="FA_Fax"
-                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        Internet<br>
-                        <input name="FA_Email" size="40" title="FA_Email"
-                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        <input name="FA_Internet" size="40" title="" title="FA_Internet"
-                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
-                        <br>
-                    </fieldset>
-                  </td>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                    <legend>
-                    <b>Openings</b>
-                    </legend>
-                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
-                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
-                    </fieldset>
-                    <br>
-                      <fieldset>
-                      <legend>
-                        <b>Bank Connection Tax Office</b>
-                      <legend>
-                      <table>
-                      <tr>
-                        <td width="40%">
-                          Bank
-                          <br>
-                          <input name="FA_Bankbezeichnung_1" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Account Nummer
-                          <br>
-                          <input name="FA_Kontonummer_1" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Bank Code (long)
-                          <br>
-                          <input name="FA_BLZ_1" size="15"
-                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
-                        </td>
-                        <td width="40%">
-                          Bank
-                          <br>
-                          <input name="FA_Bankbezeichnung_oertlich" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Account Nummer
-                          <br>
-                          <input name="FA_Kontonummer_2" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          Bank Code (long)
-                          <br>
-                          <input name="FA_BLZ_2" size="15"
-                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
-                        </td>
-                   </tr>
-             </table>
-           </fieldset>
-         </td>
-       </tr>
-    </table>
-  </fieldset>
-
-<!-- Stop Finanzamtdaten  -->
-
-        </td>
-       </tr>
-       <tr>
-         <td colspan="2">
-           <br>
-           <fieldset>
-           <legend>
-           <font size="+1">Tax Number</font>
-           </legend>
-           <br>
-[%- IF COA_Germany %]
-           [% input_steuernummer %]
-[%- ELSE %]
-Please enter the taxnumber in the administration menu userpreferences
-Current value: [% HTML.escape(myconfig_taxnumber) %]
-[%- END %]
-
-
-           </H2><br>
-           </fieldset>
-           <br>
-           <br>
-           <hr>
-         </td>
-       </tr>
-       <tr>
-         <td align="left">
-
-          [%- IF callback %]
-           <input type="button" name="Verweis" value="User Config"
-            onClick="self.location.href='[% callback %]">
-          [%- ELSE %]
-            <input type="submit" class="submit" name="action" value="back">
-          [%- END %]
-
-          [%- IF warnung %]
-
-            <input type="hidden" name="nextsub" value="config_step2">
-            <input type="submit" class="submit" name="action"
-              value="continue">
-
-            <input type="hidden" name="saved" value="Check Details">
-
-          [%- ELSE %]
-
-            <input type="hidden" name="nextsub" value="save">
-            <input type="hidden" name="filename" value="finanzamt.ini">
-            <input type="submit" class="submit" name="action" value="Save">
-
-          [%- END %]
-
-         </td>
-         <td align="right">
-           <H2 class="confirm">[%- saved %]</H2>
-         </td>
-      </tr>
-  </table>
-
-[%- FOREACH var = hidden_variables %]
-  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-[%- END %]
-
-
-  </form>
-</body>
-</html>
diff --git a/templates/webpages/ustva/config_step2_master.html b/templates/webpages/ustva/config_step2_master.html
deleted file mode 100644 (file)
index d0536f6..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step2_master.html
- and run locale/<cc>/locales.pl -->
-
-
-<body>
-  <form name="elsterform" method="post" action="[% script %]">
-    <table width="100%">
-       <tr>
-         <th colspan="2" class="listtop">
-           <translate>Tax Office Preferences</translate></th>
-       </tr>
-       <tr>
-         <td colspan=2>
-           <br>
-           <!-- Start Finanzamtdaten -->
-           <br>
-           <fieldset>
-             <legend>
-               <font size="+1"><translate>Tax Office</translate>
-               [% HTML.escape(FA_Name) %]</font>
-             </legend>
-             <table width="100%" valign="top">
-                <tr>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                      <legend>
-                      <b><translate>Address</translate></b>
-                      </legend>
-                      <table width="100%">
-                        <tr>
-                          <td>
-                            <translate>Tax Office</translate>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Name" size="40" title="FA_Name"
-                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
-                          <td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <input name="FA_Strasse" size="40" title="FA_Strasse"
-                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
-                          </td width="100%">
-                        </tr>
-                        <tr>
-                          <td width="116px">
-                            <input name="FA_PLZ" size="10" title="FA_PLZ"
-                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
-                          </td>
-                          <td>
-                            <input name="FA_Ort" size="20" title="FA_Ort"
-                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
-                          </td>
-                        </tr>
-                      </table>
-                    </fieldset>
-                    <br>
-                    <fieldset>
-                      <legend>
-                        <b><translate>Contact</translate></b>
-                      </legend>
-                        <translate>Telephone</translate><br>
-                        <input name="FA_Telefon" size="40" title="FA_Telefon"
-                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        <translate>Fax</translate><br>
-                        <input name="FA_Fax" size="40" title="FA_Fax"
-                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        <translate>Internet</translate><br>
-                        <input name="FA_Email" size="40" title="FA_Email"
-                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
-                        <br>
-                        <br>
-                        <input name="FA_Internet" size="40" title="" title="FA_Internet"
-                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
-                        <br>
-                    </fieldset>
-                  </td>
-                  <td valign="top">
-                    <br>
-                    <fieldset>
-                    <legend>
-                    <b><translate>Openings</translate></b>
-                    </legend>
-                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
-                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
-                    </fieldset>
-                    <br>
-                      <fieldset>
-                      <legend>
-                        <b><translate>Bank Connection Tax Office</translate></b>
-                      <legend>
-                      <table>
-                      <tr>
-                        <td width="40%">
-                          <translate>Bank</translate>
-                          <br>
-                          <input name="FA_Bankbezeichnung_1" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          <translate>Account Nummer</translate>
-                          <br>
-                          <input name="FA_Kontonummer_1" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          <translate>Bank Code (long)</translate>
-                          <br>
-                          <input name="FA_BLZ_1" size="15"
-                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
-                        </td>
-                        <td width="40%">
-                          <translate>Bank</translate>
-                          <br>
-                          <input name="FA_Bankbezeichnung_oertlich" size="30"
-                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          <translate>Account Nummer</translate>
-                          <br>
-                          <input name="FA_Kontonummer_2" size="15"
-                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
-                          <br>
-                          <br>
-                          <translate>Bank Code (long)</translate>
-                          <br>
-                          <input name="FA_BLZ_2" size="15"
-                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
-                        </td>
-                   </tr>
-             </table>
-           </fieldset>
-         </td>
-       </tr>
-    </table>
-  </fieldset>
-
-<!-- Stop Finanzamtdaten  -->
-
-        </td>
-       </tr>
-       <tr>
-         <td colspan="2">
-           <br>
-           <fieldset>
-           <legend>
-           <font size="+1"><translate>Tax Number</translate></font>
-           </legend>
-           <br>
-[%- IF COA_Germany %]
-           [% input_steuernummer %]
-[%- ELSE %]
-<translate>Please enter the taxnumber in the administration menu user
-preferences</translate>
-<translate>Current value:</translate> [% HTML.escape(myconfig_taxnumber) %]
-[%- END %]
-
-
-           </H2><br>
-           </fieldset>
-           <br>
-           <br>
-           <hr>
-         </td>
-       </tr>
-       <tr>
-         <td align="left">
-
-          [%- IF callback %]
-           <input type="button" name="Verweis" value="<translate>User Config</translate>"
-            onClick="self.location.href='[% callback %]">
-          [%- ELSE %]
-            <input type="submit" class="submit" name="action" value="<translate>back</translate>">
-          [%- END %]
-
-          [%- IF warnung %]
-
-            <input type="hidden" name="nextsub" value="config_step2">
-            <input type="submit" class="submit" name="action"
-              value="<translate>continue</translate>">
-
-            <input type="hidden" name="saved" value="<translate>Check
-              Details</translate>">
-
-          [%- ELSE %]
-
-            <input type="hidden" name="nextsub" value="save">
-            <input type="hidden" name="filename" value="finanzamt.ini">
-            <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-
-          [%- END %]
-
-         </td>
-         <td align="right">
-           <H2 class="confirm">[%- saved %]</H2>
-         </td>
-      </tr>
-  </table>
-
-[%- FOREACH var = hidden_variables %]
-  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
-[%- END %]
-
-
-  </form>
-</body>
-</html>
diff --git a/templates/webpages/ustva/generic_taxreport.html b/templates/webpages/ustva/generic_taxreport.html
new file mode 100644 (file)
index 0000000..e5ee490
--- /dev/null
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[% USE HTML %]<body>
+
+<h1>[% 'Generic Tax Report' | $T8 %]</h1>
+<p>[% 'Taxnumber' | $T8 %]: [% taxnumber %]</p>
+<p>[% 'Year' | $T8 %]: [% year %]</p>
+<p>[% 'Period' | $T8 %]: [% period %]</p>
+<br />
+<table width="33%">
+  <tr>
+    <th>[% 'Tax Position' | $T8 %]</th>
+    <th>[% 'Amount' | $T8 %]</th>
+  </tr>
+[% FOREACH row = USTVA %]
+  <tr class="listrow[% loop.count % 2 %]">
+
+    <td align="left">[% HTML.escape(row.id) %]</td>
+    <td align="right">[% HTML.escape(row.amount) %]</td>
+  </tr>
+[% END %]
+
+</table>
+
+</html>
+</body>
diff --git a/templates/webpages/ustva/generic_taxreport_de.html b/templates/webpages/ustva/generic_taxreport_de.html
deleted file mode 100644 (file)
index bac6610..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
-<h1>USTVA Bericht</h1>
-<p>Steuernummer: [% taxnumber %]</p>
-<p>Jahr: [% year %]</p>
-<p>Zeitraum: [% period %]</p>
-<br />
-<table width="33%">
-  <tr>
-    <th>Position</th>
-    <th>Betrag</th>
-  </tr>
-[% FOREACH row = USTVA %]
-  <tr class="listrow[% loop.count % 2 %]">
-
-    <td align="left">[% HTML.escape(row.id) %]</td>
-    <td align="right">[% HTML.escape(row.amount) %]</td>
-  </tr>
-[% END %]
-
-</table>
-
-</html>
-</body>
diff --git a/templates/webpages/ustva/generic_taxreport_en.html b/templates/webpages/ustva/generic_taxreport_en.html
deleted file mode 100644 (file)
index 4f097c6..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
-<h1>Generic Tax Report</h1>
-<p>Taxnumber: [% taxnumber %]</p>
-<p>Year: [% year %]</p>
-<p>Period: [% period %]</p>
-<br />
-<table width="33%">
-  <tr>
-    <th>Tax Position</th>
-    <th>Amount</th>
-  </tr>
-[% FOREACH row = USTVA %]
-  <tr class="listrow[% loop.count % 2 %]">
-
-    <td align="left">[% HTML.escape(row.id) %]</td>
-    <td align="right">[% HTML.escape(row.amount) %]</td>
-  </tr>
-[% END %]
-
-</table>
-
-</html>
-</body>
diff --git a/templates/webpages/ustva/generic_taxreport_master.html b/templates/webpages/ustva/generic_taxreport_master.html
deleted file mode 100644 (file)
index faf3d96..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-[% USE HTML %]<body>
-
-<h1><translate>Generic Tax Report</translate></h1>
-<p><translate>Taxnumber</translate>: [% taxnumber %]</p>
-<p><translate>Year</translate>: [% year %]</p>
-<p><translate>Period</translate>: [% period %]</p>
-<br />
-<table width="33%">
-  <tr>
-    <th><translate>Tax Position</translate></th>
-    <th><translate>Amount</translate></th>
-  </tr>
-[% FOREACH row = USTVA %]
-  <tr class="listrow[% loop.count % 2 %]">
-
-    <td align="left">[% HTML.escape(row.id) %]</td>
-    <td align="right">[% HTML.escape(row.amount) %]</td>
-  </tr>
-[% END %]
-
-</table>
-
-</html>
-</body>
diff --git a/templates/webpages/ustva/report.html b/templates/webpages/ustva/report.html
new file mode 100644 (file)
index 0000000..a397e13
--- /dev/null
@@ -0,0 +1,207 @@
+[%- USE T8 %]
+[% USE HTML %]<!--This file is autogenerated,
+ Edit templates/webpages/ustva/report_master.html
+ and run locale/<cc>/locales.pl -->
+
+ <body>
+ <form method="post" action="[% HTML.escape(script) %]">
+
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+
+ <table width="100%">
+  <tr>
+    <th class="listtop">[% HTML.escape(title) %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <td width="50%" align="left" valign="top">
+            <fieldset>
+            <legend>
+            <b>[% 'Company' | $T8 %]</b>
+            </legend>
+
+            [% company_given %]
+            [% address_given %]
+
+            <br />
+            <br />
+            [% 'Tel' | $T8 %].:&nbsp;
+            [% HTML.escape(co_tel) %]
+            <br />
+            [% 'Fax' | $T8 %].:&nbsp;
+            [% HTML.escape(co_fax) %]
+            <br />
+            <br />
+            [% HTML.escape(co_email) %]
+            <br />
+            <br />
+
+            [% 'Tax Number' | $T8 %]:&nbsp;
+[%- IF COA_Germany %]
+            [% taxnumber_given %]
+            <br />
+            [% 'ELSTER Tax Number' | $T8 %]:&nbsp;
+            [% HTML.escape(elstersteuernummer) %]
+            <br />
+            <br />
+[%- ELSE %]
+            [% taxnumber %]
+[%- END %]
+            </fieldset>
+            <br />
+
+            [%- IF FA_steuerberater_name %]
+              <fieldset>
+              <legend>
+                <input checked="checked"
+                 title="[% 'Assume Tax Consultant Data in Tax Computation?' | $T8 %]"
+                 name="FA_steuerberater"
+                 id="steuerberater"
+                 class="checkbox"
+                 type="checkbox"
+                 value="1" >
+                 &nbsp;<b>[% 'Tax Consultant' | $T8 %]</b>
+                </legend>
+
+                [% HTML.escape(FA_steuerberater_name) %]<br />
+                [% HTML.escape(FA_steuerberater_street) %]<br />
+                [% HTML.escape(FA_steuerberater_city) %]<br />
+                [% 'Tel.' | $T8 %] [% HTML.escape(FA_steuerberater_tel) %]<br />
+              </fieldset>
+              <br />
+            [%- END %]
+
+            <fieldset>
+            <legend>
+            <b>[% 'Tax Period' | $T8 %]</b>
+            </legend>
+            [% select_year %] [% ustva_vorauswahl %]
+            [% checkbox_kz_10 %]
+            <br />
+            [%- IF FA_voranmeld %]
+              <br />
+              [% period_local %]
+              [%- IF FA_dauerfrist %]
+                [% 'With Extension Of Time' | $T8 %]
+              [%- END %]
+              <br />
+            [%- END %]
+
+            [%- IF method_local %]
+              [% 'Method' | $T8 %]: [% method_local %]
+            [%- END %]
+            </fieldset>
+          </td>
+          <td width="50%" valign="top">
+              <fieldset>
+              <legend>
+                 <b>[% 'Tax Office' | $T8 %]</b>
+              </legend>
+              <h3>[% HTML.escape(FA_Name) %]</h3>
+
+              [% HTML.escape(FA_Strasse) %]
+              <br>
+              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
+              <br>
+              <br>
+              [% 'Tel' | $T8 %].:&nbsp;
+              [% HTML.escape(FA_Telefon) %]
+              <br>
+              [% 'Fax' | $T8 %].:&nbsp;
+              [% HTML.escape(FA_Fax) %]
+              <br>
+              <br>
+              <!-- Mailto alles Maskieren! -->
+              <a href="mailto:[% HTML.escape(FA_Email) %]
+                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
+                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
+                &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
+                %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
+                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
+              [% HTML.escape(FA_Email) %]
+              </a>
+              <br>
+              <a href="[% FA_Internet %]">
+              [% HTML.escape(FA_Internet) %]
+              </a>
+              <br>
+              <br>
+              [% 'Openings' | $T8 %]
+              <br>
+              [% openings %]
+              <br>
+              <br>
+              [% 'Bank Connections' | $T8 %]
+              <table>
+              <tr>
+
+              [%- FOREACH row = "tax_office_banks" %]
+                  <td width="40%">
+                  [% HTML.escape(row.Bankbezeichnung) %]
+                  <br>
+                  [% 'Account' | $T8 %]:&nbsp;
+                  [% HTML.escape(row.Kontonummer) %]
+                  <br>
+                  [% 'Bank Code' | $T8 %]:&nbsp;
+                  [% HTML.escape(row.BLZ) %]
+                  </td>
+              [%- END %]
+
+              </tr>
+              </table>
+              <br>
+              </fieldset>
+
+              <br>
+
+              <fieldset>
+              <legend>
+              <b>[% 'Outputformat' | $T8 %]</b>
+              </legend>
+[%- IF COA_Germany %]
+              [% select_options %]
+[%- ELSE %]
+              <SELECT name="format">
+                <option value="generic">[% 'Preview' | $T8 %]</option>
+              </SELECT>
+[%- END %]
+
+              </fieldset>
+          </td>
+        </tr>
+      </table>
+     </td>
+    </tr>
+    <tr>
+     <td><hr size="3" noshade></td>
+    </tr>
+  </table>
+
+  <br>
+  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
+  <input type="hidden" name="reporttype" value="custom">
+  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
+  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
+  <table width="100%">
+  <tr>
+   <td align="left">
+     <input type=hidden name=nextsub value=generate_ustva>
+     <input type=submit class=submit name=action value="[% 'Show' | $T8 %]">
+   </td>
+   <td align="right">
+
+    </form>
+    <!--
+      <form action="doc/ustva.html" method="get">
+       <input type=submit class=submit name=action
+       value="[% 'Help' | $T8 %]">
+   </form>
+    -->
+   </td>
+  </tr>
+  </table>
+</body>
+</html>
diff --git a/templates/webpages/ustva/report_de.html b/templates/webpages/ustva/report_de.html
deleted file mode 100644 (file)
index 624d292..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/report_master.html
- and run locale/<cc>/locales.pl -->
-
- <body>
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
- <table width="100%">
-  <tr>
-    <th class="listtop">[% HTML.escape(title) %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <td width="50%" align="left" valign="top">
-            <fieldset>
-            <legend>
-            <b>Firma</b>
-            </legend>
-
-            [% company_given %]
-            [% address_given %]
-
-            <br />
-            <br />
-            Tel.:&nbsp;
-            [% HTML.escape(co_tel) %]
-            <br />
-            Fax.:&nbsp;
-            [% HTML.escape(co_fax) %]
-            <br />
-            <br />
-            [% HTML.escape(co_email) %]
-            <br />
-            <br />
-
-            Steuernummer:&nbsp;
-[%- IF COA_Germany %]
-            [% taxnumber_given %]
-            <br />
-            ELSTER-Steuernummer:&nbsp;
-            [% HTML.escape(elstersteuernummer) %]
-            <br />
-            <br />
-[%- ELSE %]
-            [% taxnumber %]
-[%- END %]
-            </fieldset>
-            <br />
-
-            [%- IF FA_steuerberater_name %]
-              <fieldset>
-              <legend>
-                <input checked="checked"
-                 title="Beraterdaten in UStVA übernehmen?"
-                 name="FA_steuerberater"
-                 id="steuerberater"
-                 class="checkbox"
-                 type="checkbox"
-                 value="1" >
-                 &nbsp;<b>Steuerberater/-in</b>
-                </legend>
-
-                [% HTML.escape(FA_steuerberater_name) %]<br />
-                [% HTML.escape(FA_steuerberater_street) %]<br />
-                [% HTML.escape(FA_steuerberater_city) %]<br />
-                Telefon [% HTML.escape(FA_steuerberater_tel) %]<br />
-              </fieldset>
-              <br />
-            [%- END %]
-
-            <fieldset>
-            <legend>
-            <b>Voranmeldungszeitraum</b>
-            </legend>
-            [% select_year %] [% ustva_vorauswahl %]
-            [% checkbox_kz_10 %]
-            <br />
-            [%- IF FA_voranmeld %]
-              <br />
-              [% period_local %]
-              [%- IF FA_dauerfrist %]
-                mit Dauerfristverlängerung
-              [%- END %]
-              <br />
-            [%- END %]
-
-            [%- IF method_local %]
-              Verfahren: [% method_local %]
-            [%- END %]
-            </fieldset>
-          </td>
-          <td width="50%" valign="top">
-              <fieldset>
-              <legend>
-                 <b>Finanzamt</b>
-              </legend>
-              <h3>[% HTML.escape(FA_Name) %]</h3>
-
-              [% HTML.escape(FA_Strasse) %]
-              <br>
-              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
-              <br>
-              <br>
-              Tel.:&nbsp;
-              [% HTML.escape(FA_Telefon) %]
-              <br>
-              Fax.:&nbsp;
-              [% HTML.escape(FA_Fax) %]
-              <br>
-              <br>
-              <!-- Mailto alles Maskieren! -->
-              <a href="mailto:[% HTML.escape(FA_Email) %]
-                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
-                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
-                &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
-                %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
-                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
-              [% HTML.escape(FA_Email) %]
-              </a>
-              <br>
-              <a href="[% FA_Internet %]">
-              [% HTML.escape(FA_Internet) %]
-              </a>
-              <br>
-              <br>
-              Öffnungszeiten
-              <br>
-              [% openings %]
-              <br>
-              <br>
-              Bankverbindungen
-              <table>
-              <tr>
-
-              [%- FOREACH row = "tax_office_banks" %]
-                  <td width="40%">
-                  [% HTML.escape(row.Bankbezeichnung) %]
-                  <br>
-                  Konto:&nbsp;
-                  [% HTML.escape(row.Kontonummer) %]
-                  <br>
-                  BLZ:&nbsp;
-                  [% HTML.escape(row.BLZ) %]
-                  </td>
-              [%- END %]
-
-              </tr>
-              </table>
-              <br>
-              </fieldset>
-
-              <br>
-
-              <fieldset>
-              <legend>
-              <b>Ausgabeformat</b>
-              </legend>
-[%- IF COA_Germany %]
-              [% select_options %]
-[%- ELSE %]
-              <SELECT name="format">
-                <option value="generic">Druckvorschau</option>
-              </SELECT>
-[%- END %]
-
-              </fieldset>
-          </td>
-        </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size="3" noshade></td>
-    </tr>
-  </table>
-
-  <br>
-  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
-  <input type="hidden" name="reporttype" value="custom">
-  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
-  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
-  <table width="100%">
-  <tr>
-   <td align="left">
-     <input type=hidden name=nextsub value=generate_ustva>
-     <input type=submit class=submit name=action value="Zeigen">
-   </td>
-   <td align="right">
-
-    </form>
-    <!--
-      <form action="doc/ustva.html" method="get">
-       <input type=submit class=submit name=action
-       value="Hilfe">
-   </form>
-    -->
-   </td>
-  </tr>
-  </table>
-</body>
-</html>
diff --git a/templates/webpages/ustva/report_en.html b/templates/webpages/ustva/report_en.html
deleted file mode 100644 (file)
index d87ab5d..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/report_master.html
- and run locale/<cc>/locales.pl -->
-
- <body>
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
- <table width="100%">
-  <tr>
-    <th class="listtop">[% HTML.escape(title) %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <td width="50%" align="left" valign="top">
-            <fieldset>
-            <legend>
-            <b>Company</b>
-            </legend>
-
-            [% company_given %]
-            [% address_given %]
-
-            <br />
-            <br />
-            Tel.:&nbsp;
-            [% HTML.escape(co_tel) %]
-            <br />
-            Fax.:&nbsp;
-            [% HTML.escape(co_fax) %]
-            <br />
-            <br />
-            [% HTML.escape(co_email) %]
-            <br />
-            <br />
-
-            Tax Number:&nbsp;
-[%- IF COA_Germany %]
-            [% taxnumber_given %]
-            <br />
-            ELSTER Tax Number:&nbsp;
-            [% HTML.escape(elstersteuernummer) %]
-            <br />
-            <br />
-[%- ELSE %]
-            [% taxnumber %]
-[%- END %]
-            </fieldset>
-            <br />
-
-            [%- IF FA_steuerberater_name %]
-              <fieldset>
-              <legend>
-                <input checked="checked"
-                 title="Assume Tax Consultant Data in Tax Computation?"
-                 name="FA_steuerberater"
-                 id="steuerberater"
-                 class="checkbox"
-                 type="checkbox"
-                 value="1" >
-                 &nbsp;<b>Tax Consultant</b>
-                </legend>
-
-                [% HTML.escape(FA_steuerberater_name) %]<br />
-                [% HTML.escape(FA_steuerberater_street) %]<br />
-                [% HTML.escape(FA_steuerberater_city) %]<br />
-                Tel. [% HTML.escape(FA_steuerberater_tel) %]<br />
-              </fieldset>
-              <br />
-            [%- END %]
-
-            <fieldset>
-            <legend>
-            <b>Tax Period</b>
-            </legend>
-            [% select_year %] [% ustva_vorauswahl %]
-            [% checkbox_kz_10 %]
-            <br />
-            [%- IF FA_voranmeld %]
-              <br />
-              [% period_local %]
-              [%- IF FA_dauerfrist %]
-                With Extension Of Time
-              [%- END %]
-              <br />
-            [%- END %]
-
-            [%- IF method_local %]
-              Method: [% method_local %]
-            [%- END %]
-            </fieldset>
-          </td>
-          <td width="50%" valign="top">
-              <fieldset>
-              <legend>
-                 <b>Tax Office</b>
-              </legend>
-              <h3>[% HTML.escape(FA_Name) %]</h3>
-
-              [% HTML.escape(FA_Strasse) %]
-              <br>
-              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
-              <br>
-              <br>
-              Tel.:&nbsp;
-              [% HTML.escape(FA_Telefon) %]
-              <br>
-              Fax.:&nbsp;
-              [% HTML.escape(FA_Fax) %]
-              <br>
-              <br>
-              <!-- Mailto alles Maskieren! -->
-              <a href="mailto:[% HTML.escape(FA_Email) %]
-                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
-                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
-                &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
-                %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
-                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
-              [% HTML.escape(FA_Email) %]
-              </a>
-              <br>
-              <a href="[% FA_Internet %]">
-              [% HTML.escape(FA_Internet) %]
-              </a>
-              <br>
-              <br>
-              Openings
-              <br>
-              [% openings %]
-              <br>
-              <br>
-              Bank Connections
-              <table>
-              <tr>
-
-              [%- FOREACH row = "tax_office_banks" %]
-                  <td width="40%">
-                  [% HTML.escape(row.Bankbezeichnung) %]
-                  <br>
-                  Account:&nbsp;
-                  [% HTML.escape(row.Kontonummer) %]
-                  <br>
-                  Bank Code:&nbsp;
-                  [% HTML.escape(row.BLZ) %]
-                  </td>
-              [%- END %]
-
-              </tr>
-              </table>
-              <br>
-              </fieldset>
-
-              <br>
-
-              <fieldset>
-              <legend>
-              <b>Outputformat</b>
-              </legend>
-[%- IF COA_Germany %]
-              [% select_options %]
-[%- ELSE %]
-              <SELECT name="format">
-                <option value="generic">Preview</option>
-              </SELECT>
-[%- END %]
-
-              </fieldset>
-          </td>
-        </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size="3" noshade></td>
-    </tr>
-  </table>
-
-  <br>
-  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
-  <input type="hidden" name="reporttype" value="custom">
-  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
-  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
-  <table width="100%">
-  <tr>
-   <td align="left">
-     <input type=hidden name=nextsub value=generate_ustva>
-     <input type=submit class=submit name=action value="Show">
-   </td>
-   <td align="right">
-
-    </form>
-    <!--
-      <form action="doc/ustva.html" method="get">
-       <input type=submit class=submit name=action
-       value="Help">
-   </form>
-    -->
-   </td>
-  </tr>
-  </table>
-</body>
-</html>
diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html
deleted file mode 100644 (file)
index 0aab4a8..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/report_master.html
- and run locale/<cc>/locales.pl -->
-
- <body>
- <form method="post" action="[% HTML.escape(script) %]">
-
- <input type="hidden" name="title" value="[% HTML.escape(title) %]">
-
- <table width="100%">
-  <tr>
-    <th class="listtop">[% HTML.escape(title) %]</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <td width="50%" align="left" valign="top">
-            <fieldset>
-            <legend>
-            <b><translate>Company</translate></b>
-            </legend>
-
-            [% company_given %]
-            [% address_given %]
-
-            <br />
-            <br />
-            <translate>Tel</translate>.:&nbsp;
-            [% HTML.escape(co_tel) %]
-            <br />
-            <translate>Fax</translate>.:&nbsp;
-            [% HTML.escape(co_fax) %]
-            <br />
-            <br />
-            [% HTML.escape(co_email) %]
-            <br />
-            <br />
-
-            <translate>Tax Number</translate>:&nbsp;
-[%- IF COA_Germany %]
-            [% taxnumber_given %]
-            <br />
-            <translate>ELSTER Tax Number</translate>:&nbsp;
-            [% HTML.escape(elstersteuernummer) %]
-            <br />
-            <br />
-[%- ELSE %]
-            [% taxnumber %]
-[%- END %]
-            </fieldset>
-            <br />
-
-            [%- IF FA_steuerberater_name %]
-              <fieldset>
-              <legend>
-                <input checked="checked"
-                 title="<translate>Assume Tax Consultant Data in Tax Computation?</translate>"
-                 name="FA_steuerberater"
-                 id="steuerberater"
-                 class="checkbox"
-                 type="checkbox"
-                 value="1" >
-                 &nbsp;<b><translate>Tax Consultant</translate></b>
-                </legend>
-
-                [% HTML.escape(FA_steuerberater_name) %]<br />
-                [% HTML.escape(FA_steuerberater_street) %]<br />
-                [% HTML.escape(FA_steuerberater_city) %]<br />
-                <translate>Tel.</translate> [% HTML.escape(FA_steuerberater_tel) %]<br />
-              </fieldset>
-              <br />
-            [%- END %]
-
-            <fieldset>
-            <legend>
-            <b><translate>Tax Period</translate></b>
-            </legend>
-            [% select_year %] [% ustva_vorauswahl %]
-            [% checkbox_kz_10 %]
-            <br />
-            [%- IF FA_voranmeld %]
-              <br />
-              [% period_local %]
-              [%- IF FA_dauerfrist %]
-                <translate>With Extension Of Time</translate>
-              [%- END %]
-              <br />
-            [%- END %]
-
-            [%- IF method_local %]
-              <translate>Method</translate>: [% method_local %]
-            [%- END %]
-            </fieldset>
-          </td>
-          <td width="50%" valign="top">
-              <fieldset>
-              <legend>
-                 <b><translate>Tax Office</translate></b>
-              </legend>
-              <h3>[% HTML.escape(FA_Name) %]</h3>
-
-              [% HTML.escape(FA_Strasse) %]
-              <br>
-              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
-              <br>
-              <br>
-              <translate>Tel</translate>.:&nbsp;
-              [% HTML.escape(FA_Telefon) %]
-              <br>
-              <translate>Fax</translate>.:&nbsp;
-              [% HTML.escape(FA_Fax) %]
-              <br>
-              <br>
-              <!-- Mailto alles Maskieren! -->
-              <a href="mailto:[% HTML.escape(FA_Email) %]
-                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
-                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
-                &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
-                %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
-                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
-              [% HTML.escape(FA_Email) %]
-              </a>
-              <br>
-              <a href="[% FA_Internet %]">
-              [% HTML.escape(FA_Internet) %]
-              </a>
-              <br>
-              <br>
-              <translate>Openings</translate>
-              <br>
-              [% openings %]
-              <br>
-              <br>
-              <translate>Bank Connections</translate>
-              <table>
-              <tr>
-
-              [%- FOREACH row = "tax_office_banks" %]
-                  <td width="40%">
-                  [% HTML.escape(row.Bankbezeichnung) %]
-                  <br>
-                  <translate>Account</translate>:&nbsp;
-                  [% HTML.escape(row.Kontonummer) %]
-                  <br>
-                  <translate>Bank Code</translate>:&nbsp;
-                  [% HTML.escape(row.BLZ) %]
-                  </td>
-              [%- END %]
-
-              </tr>
-              </table>
-              <br>
-              </fieldset>
-
-              <br>
-
-              <fieldset>
-              <legend>
-              <b><translate>Outputformat</translate></b>
-              </legend>
-[%- IF COA_Germany %]
-              [% select_options %]
-[%- ELSE %]
-              <SELECT name="format">
-                <option value="generic"><translate>Preview</translate></option>
-              </SELECT>
-[%- END %]
-
-              </fieldset>
-          </td>
-        </tr>
-      </table>
-     </td>
-    </tr>
-    <tr>
-     <td><hr size="3" noshade></td>
-    </tr>
-  </table>
-
-  <br>
-  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
-  <input type="hidden" name="reporttype" value="custom">
-  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
-  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
-  <table width="100%">
-  <tr>
-   <td align="left">
-     <input type=hidden name=nextsub value=generate_ustva>
-     <input type=submit class=submit name=action value="<translate>Show</translate>">
-   </td>
-   <td align="right">
-
-    </form>
-    <!--
-      <form action="doc/ustva.html" method="get">
-       <input type=submit class=submit name=action
-       value="<translate>Help</translate>">
-   </form>
-    -->
-   </td>
-  </tr>
-  </table>
-</body>
-</html>
diff --git a/templates/webpages/webdav/_list.html b/templates/webpages/webdav/_list.html
new file mode 100644 (file)
index 0000000..3432fc6
--- /dev/null
@@ -0,0 +1,22 @@
+
+[%- IF webdav %]
+  <tr>
+   <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+   <table width="100%">
+    <tr>
+     <td align="left" width="30%"><b>Dateiname</b></td>
+     <td align="left" width="70%"><b>Webdavlink</b></td>
+    </tr>
+ [%- FOREACH file = WEBDAV %]
+    <tr>
+     <td align="left">[% file.name %]</td>
+     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+    </tr>
+ [%- END %]
+   </table>
+  </tr>
+[% END %]
diff --git a/templates/webpages/webdav/_list_de.html b/templates/webpages/webdav/_list_de.html
deleted file mode 100644 (file)
index 3432fc6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[%- IF webdav %]
-  <tr>
-   <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>Webdavlink</b></td>
-    </tr>
- [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% file.name %]</td>
-     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
-    </tr>
- [%- END %]
-   </table>
-  </tr>
-[% END %]
diff --git a/templates/webpages/webdav/_list_en.html b/templates/webpages/webdav/_list_en.html
deleted file mode 100644 (file)
index 3432fc6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[%- IF webdav %]
-  <tr>
-   <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>Webdavlink</b></td>
-    </tr>
- [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% file.name %]</td>
-     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
-    </tr>
- [%- END %]
-   </table>
-  </tr>
-[% END %]
diff --git a/templates/webpages/webdav/_list_master.html b/templates/webpages/webdav/_list_master.html
deleted file mode 100644 (file)
index 3432fc6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[%- IF webdav %]
-  <tr>
-   <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>Webdavlink</b></td>
-    </tr>
- [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% file.name %]</td>
-     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
-    </tr>
- [%- END %]
-   </table>
-  </tr>
-[% END %]
diff --git a/templates/webpages/wh/journal_filter.html b/templates/webpages/wh/journal_filter.html
new file mode 100644 (file)
index 0000000..83ba78b
--- /dev/null
@@ -0,0 +1,242 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+
+ <script type="text/javascript">
+   <!--
+      warehouses = new Array();
+      warehouses[0] = new Array();
+      warehouses[0]['id'] = "0";
+      warehouses[0]['bins'] = new Array();
+      warehouses[0]['bins'][0] = new Array();
+      warehouses[0]['bins'][0]['description'] = "---";
+      warehouses[0]['bins'][0]['id'] = "";
+      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
+      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(warehouse_id, bin_id) {
+        var control = document.getElementById("bin_id");
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        var warehouse_index = 0;
+
+        for (i = 0; i < warehouses.length; i++)
+          if (warehouses[i]['id'] == warehouse_id) {
+            warehouse_index = i;
+            break;
+          }
+
+        var warehouse = warehouses[warehouse_index];
+        var bin_index = 0;
+
+        for (i = 0; i < warehouse['bins'].length; i++)
+          if (warehouse['bins'][i]['id'] == bin_id) {
+            bin_index = i;
+            break;
+          }
+
+        for (i = 0; i < warehouse['bins'].length; i++) {
+          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+        }
+
+
+        control.options[bin_index].selected = true;
+      }
+
+      function on_load() {
+        warehouse_selected(0, 0);
+        document.Form.partnumber.focus();
+      }
+     -->
+ </script>
+
+ <div class="listtop">[% 'Report about wareouse transactions' | $T8 %]</div>
+
+ <form method="post" name="Form" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="generate_journal">
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
+        <td>
+         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+          <option value="">---</option>
+          [%- FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+          [%- END %]
+         </select>
+        </td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
+        <td><select name="bin_id" id="bin_id"></select></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
+        <td><input name="partnumber" id="partnumber" size=20></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
+        <td><input name="description" size=40></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
+        <td><input name="chargenumber" size=40></td>
+       </tr>
+       [% IF conf_show_best_before %]
+       <tr>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
+       [% END %]
+       <tr>
+        <th align="right" nowrap>[% 'Transfer Quantity' | $T8 %]:</th>
+        <td>
+         <select name="qty_op">
+          <option value="dontcare">---</option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
+         </select>
+         <input name="qty">
+         <select name="qty_unit">
+          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
+         </select>
+        </td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'From Date' | $T8 %]</th>
+        <td>
+         <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
+        </td>
+       </tr>
+       <tr>
+        <th align="right">[% 'To Date' | $T8 %]</th>
+        <td>
+         <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_todate" id="todate_trigger" value="?">
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+
+    <tr height="5"><td>&nbsp;</td></tr>
+
+    <tr>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
+        <td nowrap><label for="l_partdescription">[% 'Part Description' | $T8 %]</label></td>
+        <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
+        <td nowrap><label for="l_qty">[% 'Quantity' | $T8 %]</label></td>
+       </tr>
+       <tr>
+        <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_date">[% 'Date' | $T8 %]</label></td>
+        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
+        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
+        [% IF conf_show_best_before %]
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
+        [% END %]
+       </tr>
+       <tr>
+        <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_trans_id">[% 'Trans Id' | $T8 %]</label></td>
+        <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_trans_type">[% 'Trans Type' | $T8 %]</label></td>
+        <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_comment">[% 'Comment' | $T8 %]</label></td>
+       </tr>
+       <tr>
+        <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_warehouse_from">[% 'Warehouse From' | $T8 %]</label></td>
+        <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bin_from">[% 'Bin From' | $T8 %]</label></td>
+        <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_warehouse_to">[% 'Warehouse To' | $T8 %]</label></td>
+        <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bin_to">[% 'Bin To' | $T8 %]</label></td>
+       </tr>
+       <tr>
+        <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_employee">[% 'Employee' | $T8 %]</label></td>
+        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_oe_id">[% 'Document' | $T8 %]</label></td>
+        <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_projectnumber">[% 'Project Number' | $T8 %]</label></td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+  <script type="text/javascript">
+    <!--
+    [% IF conf_show_best_before %]
+    Calendar.setup( {
+      inputField : "bestbefore",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger"
+    });
+    [% END %]
+
+    Calendar.setup( {
+      inputField : "fromdate",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "fromdate_trigger"
+    });
+
+     Calendar.setup( {
+      inputField : "todate",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BL",
+      button : "todate_trigger"
+    });
+     //-->
+  </script>
+
+</body>
+</html>
diff --git a/templates/webpages/wh/journal_filter_de.html b/templates/webpages/wh/journal_filter_de.html
deleted file mode 100644 (file)
index 725e748..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop">Bericht &uuml;ber Lagerbewegungen</div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_journal">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Lager:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Lagerplatz:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Artikelnummer:</th>
-        <td><input name="partnumber" id="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Artikelbeschreibung:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Chargennummer:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap>Mindesthaltbarkeit:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap>Umlagermenge:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast">Mindestens</option>
-          <option value="atmost">H&ouml;chstens</option>
-          <option value="exact">Genau</option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Von</th>
-        <td>
-         <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
-        </td>
-       </tr>
-       <tr>
-        <th align="right">Bis</th>
-        <td>
-         <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_todate" id="todate_trigger" value="?">
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>In Bericht aufnehmen</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_partdescription">Artikelbeschreibung</label></td>
-        <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_qty">Menge</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_date">Datum</label></td>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
-        [% END %]
-       </tr>
-       <tr>
-        <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_trans_id">Trans-ID</label></td>
-        <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_trans_type">Transfertyp</label></td>
-        <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_comment">Kommentar</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_from">Quelllager</label></td>
-        <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_from">Quelllagerplatz</label></td>
-        <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_to">Ziellager</label></td>
-        <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_to">Ziellagerplatz</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_employee">Bearbeiter</label></td>
-        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_oe_id">Dokument</label></td>
-        <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_projectnumber">Projektnummer</label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-  <script type="text/javascript">
-    <!--
-    [% IF conf_show_best_before %]
-    Calendar.setup( {
-      inputField : "bestbefore",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger"
-    });
-    [% END %]
-
-    Calendar.setup( {
-      inputField : "fromdate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "fromdate_trigger"
-    });
-
-     Calendar.setup( {
-      inputField : "todate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BL",
-      button : "todate_trigger"
-    });
-     //-->
-  </script>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/journal_filter_en.html b/templates/webpages/wh/journal_filter_en.html
deleted file mode 100644 (file)
index 3db64d0..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop">Report about wareouse transactions</div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_journal">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Warehouse:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Bin:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Part Number:</th>
-        <td><input name="partnumber" id="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Part Description:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Charge Number:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap>Best Before:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap>Transfer Quantity:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast">At least</option>
-          <option value="atmost">At most</option>
-          <option value="exact">Exact</option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>From Date</th>
-        <td>
-         <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
-        </td>
-       </tr>
-       <tr>
-        <th align="right">To Date</th>
-        <td>
-         <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_todate" id="todate_trigger" value="?">
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Include in Report</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_partdescription">Part Description</label></td>
-        <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_qty">Quantity</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_date">Date</label></td>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Part Number</label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Charge Number</label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Best Before</label></td>
-        [% END %]
-       </tr>
-       <tr>
-        <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_trans_id">Trans Id</label></td>
-        <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_trans_type">Trans Type</label></td>
-        <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_comment">Comment</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_from">Warehouse From</label></td>
-        <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_from">Bin From</label></td>
-        <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_to">Warehouse To</label></td>
-        <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_to">Bin To</label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_employee">Employee</label></td>
-        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_oe_id">Document</label></td>
-        <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_projectnumber">Project Number</label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
- </form>
-
-  <script type="text/javascript">
-    <!--
-    [% IF conf_show_best_before %]
-    Calendar.setup( {
-      inputField : "bestbefore",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger"
-    });
-    [% END %]
-
-    Calendar.setup( {
-      inputField : "fromdate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "fromdate_trigger"
-    });
-
-     Calendar.setup( {
-      inputField : "todate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BL",
-      button : "todate_trigger"
-    });
-     //-->
-  </script>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/journal_filter_master.html b/templates/webpages/wh/journal_filter_master.html
deleted file mode 100644 (file)
index 5506045..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop"><translate>Report about wareouse transactions</translate></div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_journal">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Filter</translate></th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap><translate>Warehouse</translate>:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Bin</translate>:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Part Number</translate>:</th>
-        <td><input name="partnumber" id="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Part Description</translate>:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Charge Number</translate>:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap><translate>Best Before</translate>:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap><translate>Transfer Quantity</translate>:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast"><translate>At least</translate></option>
-          <option value="atmost"><translate>At most</translate></option>
-          <option value="exact"><translate>Exact</translate></option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>From Date</translate></th>
-        <td>
-         <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
-        </td>
-       </tr>
-       <tr>
-        <th align="right"><translate>To Date</translate></th>
-        <td>
-         <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_todate" id="todate_trigger" value="?">
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Include in Report</translate></th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_partdescription"><translate>Part Description</translate></label></td>
-        <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_qty"><translate>Quantity</translate></label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_date"><translate>Date</translate></label></td>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber"><translate>Part Number</translate></label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber"><translate>Charge Number</translate></label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore"><translate>Best Before</translate></label></td>
-        [% END %]
-       </tr>
-       <tr>
-        <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_trans_id"><translate>Trans Id</translate></label></td>
-        <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_trans_type"><translate>Trans Type</translate></label></td>
-        <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_comment"><translate>Comment</translate></label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_from"><translate>Warehouse From</translate></label></td>
-        <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_from"><translate>Bin From</translate></label></td>
-        <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_to"><translate>Warehouse To</translate></label></td>
-        <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_to"><translate>Bin To</translate></label></td>
-       </tr>
-       <tr>
-        <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_employee"><translate>Employee</translate></label></td>
-        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_oe_id"><translate>Document</translate></label></td>
-        <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_projectnumber"><translate>Project Number</translate></label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-  <script type="text/javascript">
-    <!--
-    [% IF conf_show_best_before %]
-    Calendar.setup( {
-      inputField : "bestbefore",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "bestbefore_trigger"
-    });
-    [% END %]
-
-    Calendar.setup( {
-      inputField : "fromdate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BR",
-      button : "fromdate_trigger"
-    });
-
-     Calendar.setup( {
-      inputField : "todate",
-      ifFormat :"[% myconfig_jsc_dateformat %]",
-      align : "BL",
-      button : "todate_trigger"
-    });
-     //-->
-  </script>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/removal_parts_selection.html b/templates/webpages/wh/removal_parts_selection.html
new file mode 100644 (file)
index 0000000..f156cb7
--- /dev/null
@@ -0,0 +1,89 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]<body>
+
+ <form method="post" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="remove_parts">
+  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]</p>
+
+  <p>
+   <table>
+    <tr>
+     <td>[% 'Select type of removal' | $T8 %]:</td>
+     <td>
+      <select name="transfer_type_id">
+       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td>[% 'Optional comment' | $T8 %]:</td>
+     <td><input name="comment" size="60"></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading">[% 'Removal qty' | $T8 %]</th>
+    </tr>
+
+    [% FOREACH row = CONTENTS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
+     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
+     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
+     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
+     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     [% IF conf_show_best_before %]
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+     [% END %]
+     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
+     <td>[% HTML.escape(row.bindescription) %]</td>
+     <td>[% HTML.escape(row.partnumber) %]</td>
+     <td>[% HTML.escape(row.partdescription) %]</td>
+     <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
+     <td>[% HTML.escape(row.ean) %]</td>
+     <td>[% HTML.escape(row.qty) %]</td>
+     <td>
+      <input name="qty_[% loop.count %]">
+      <select name="unit_[% loop.count %]">
+       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+    [% END %]
+
+    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
+
+    <tr><td colspan="7"><hr size="3" noshade></td></tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/wh/removal_parts_selection_de.html b/templates/webpages/wh/removal_parts_selection_de.html
deleted file mode 100644 (file)
index 3ff1612..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="remove_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Entnahme aus Lager: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td>Grund der Entnahme ausw&auml;hlen:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td>Optionaler Kommentar:</td>
-     <td><input name="comment" size="60"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Artikelnummer</th>
-     <th class="listheading">Artikelbeschreibung</th>
-     <th class="listheading">Chargennummer</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
-     [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Lagerbestand</th>
-     <th class="listheading">Entnahmemenge</th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td>
-      <input name="qty_[% loop.count %]">
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-    <tr><td colspan="7"><hr size="3" noshade></td></tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/removal_parts_selection_en.html b/templates/webpages/wh/removal_parts_selection_en.html
deleted file mode 100644 (file)
index 34fec86..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="remove_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Removal from warehouse: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td>Select type of removal:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td>Optional comment:</td>
-     <td><input name="comment" size="60"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Bin</th>
-     <th class="listheading">Part Number</th>
-     <th class="listheading">Part Description</th>
-     <th class="listheading">Charge Number</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Best Before</th>
-     [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Available qty</th>
-     <th class="listheading">Removal qty</th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td>
-      <input name="qty_[% loop.count %]">
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-    <tr><td colspan="7"><hr size="3" noshade></td></tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/removal_parts_selection_master.html b/templates/webpages/wh/removal_parts_selection_master.html
deleted file mode 100644 (file)
index ec48a78..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="remove_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p><translate>Removal from warehouse</translate>: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td><translate>Select type of removal</translate>:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td><translate>Optional comment</translate>:</td>
-     <td><input name="comment" size="60"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Part Number</translate></th>
-     <th class="listheading"><translate>Part Description</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
-     [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
-     [% END %]
-     <th class="listheading"><translate>EAN</translate></th>
-     <th class="listheading"><translate>Available qty</translate></th>
-     <th class="listheading"><translate>Removal qty</translate></th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td>
-      <input name="qty_[% loop.count %]">
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-    <tr><td colspan="7"><hr size="3" noshade></td></tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
new file mode 100644 (file)
index 0000000..e0ef887
--- /dev/null
@@ -0,0 +1,205 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+
+ <script type="text/javascript">
+   <!--
+      warehouses = new Array();
+      warehouses[0] = new Array();
+      warehouses[0]['id'] = "0";
+      warehouses[0]['bins'] = new Array();
+      warehouses[0]['bins'][0] = new Array();
+      warehouses[0]['bins'][0]['description'] = "---";
+      warehouses[0]['bins'][0]['id'] = "";
+      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
+      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(warehouse_id, bin_id) {
+        var control = document.getElementById("bin_id");
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        var warehouse_index = 0;
+
+        for (i = 0; i < warehouses.length; i++)
+          if (warehouses[i]['id'] == warehouse_id) {
+            warehouse_index = i;
+            break;
+          }
+
+        var warehouse = warehouses[warehouse_index];
+        var bin_index = 0;
+
+        for (i = 0; i < warehouse['bins'].length; i++)
+          if (warehouse['bins'][i]['id'] == bin_id) {
+            bin_index = i;
+            break;
+          }
+
+        for (i = 0; i < warehouse['bins'].length; i++) {
+          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+        }
+
+
+        control.options[bin_index].selected = true;
+      }
+
+      function on_load() {
+        warehouse_selected(0, 0);
+        document.Form.partnumber.focus();
+      }
+     -->
+ </script>
+
+ <div class="listtop">[% 'Report about wareouse contents' | $T8 %]</div>
+
+ <form method="post" name="Form" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="generate_report">
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <td>
+      <table>
+       <tr>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
+        <td>
+         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+          <option value="">---</option>
+          [%- FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+          [%- END %]
+         </select>
+        </td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
+        <td><select name="bin_id" id="bin_id"></select></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
+        <td><input name="partnumber" size=20></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
+        <td><input name="description" size=40></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
+        <td><input name="chargenumber" size=40></td>
+       </tr>
+       [% IF conf_show_best_before %]
+       <tr>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
+       [% END %]
+       <tr>
+        <th align="right" nowrap>[% 'Qty in stock' | $T8 %]:</th>
+        <td>
+         <select name="qty_op">
+          <option value="dontcare">---</option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
+         </select>
+         <input name="qty">
+         <select name="qty_unit">
+          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
+         </select>
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+
+    <tr height="5"><td>&nbsp;</td></tr>
+
+    <tr>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
+    </tr>
+
+    <tr>
+     <td>
+      <input name="l_partdescription" type="hidden" value="Y">
+      <input name="l_qty" type="hidden" value="Y">
+
+      <table>
+       <tr>
+        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
+        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
+       </tr>
+
+       <tr>
+        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
+        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
+        [% IF conf_show_best_before %]
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
+        [% END %]
+       </tr>
+
+       <tr><td colspan="4"><hr noshade height="1"></td></tr>
+
+       <tr>
+        <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="subtotal">[% 'Subtotal' | $T8 %]</label></td>
+        <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label></td>
+       </tr>
+
+       <tr>
+        <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_stock_value">[% 'Stock value' | $T8 %]</label></td>
+       </tr>
+
+      </table>
+     </td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+ [% IF conf_show_best_before %]
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/wh/report_filter_de.html b/templates/webpages/wh/report_filter_de.html
deleted file mode 100644 (file)
index 80091c2..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop">Bericht &uuml;ber eingelagerte Waren</div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Lager:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Lagerplatz:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Artikelnummer:</th>
-        <td><input name="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Artikelbeschreibung:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Chargennummer:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap>Mindesthaltbarkeit:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap>Lagerbestand:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast">Mindestens</option>
-          <option value="atmost">H&ouml;chstens</option>
-          <option value="exact">Genau</option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>In Bericht aufnehmen</th>
-    </tr>
-
-    <tr>
-     <td>
-      <input name="l_partdescription" type="hidden" value="Y">
-      <input name="l_qty" type="hidden" value="Y">
-
-      <table>
-       <tr>
-        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription">Lager</label></td>
-        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription">Lagerplatz</label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
-        [% END %]
-       </tr>
-
-       <tr><td colspan="4"><hr noshade height="1"></td></tr>
-
-       <tr>
-        <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="subtotal">Zwischensumme</label></td>
-        <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="include_empty_bins">Leere Lagerpl&auml;tze anzeigen</label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_stock_value">Bestandswert</label></td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/report_filter_en.html b/templates/webpages/wh/report_filter_en.html
deleted file mode 100644 (file)
index 633c188..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop">Report about wareouse contents</div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap>Warehouse:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Bin:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Part Number:</th>
-        <td><input name="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Part Description:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap>Charge Number:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap>Best Before:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap>Qty in stock:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast">At least</option>
-          <option value="atmost">At most</option>
-          <option value="exact">Exact</option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Include in Report</th>
-    </tr>
-
-    <tr>
-     <td>
-      <input name="l_partdescription" type="hidden" value="Y">
-      <input name="l_qty" type="hidden" value="Y">
-
-      <table>
-       <tr>
-        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription">Warehouse</label></td>
-        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription">Bin</label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Part Number</label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Charge Number</label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Best Before</label></td>
-        [% END %]
-       </tr>
-
-       <tr><td colspan="4"><hr noshade height="1"></td></tr>
-
-       <tr>
-        <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="subtotal">Subtotal</label></td>
-        <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="include_empty_bins">Include empty bins</label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_stock_value">Stock value</label></td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/report_filter_master.html b/templates/webpages/wh/report_filter_master.html
deleted file mode 100644 (file)
index 4a65f66..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      warehouses[0] = new Array();
-      warehouses[0]['id'] = "0";
-      warehouses[0]['bins'] = new Array();
-      warehouses[0]['bins'][0] = new Array();
-      warehouses[0]['bins'][0]['description'] = "---";
-      warehouses[0]['bins'][0]['id'] = "";
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <div class="listtop"><translate>Report about wareouse contents</translate></div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_report">
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Filter</translate></th>
-    </tr>
-
-    <tr>
-     <td>
-      <table>
-       <tr>
-        <th align="right" nowrap><translate>Warehouse</translate>:</th>
-        <td>
-         <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-          <option value="">---</option>
-          [%- FOREACH warehouse = WAREHOUSES %]
-          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Bin</translate>:</th>
-        <td><select name="bin_id" id="bin_id"></select></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Part Number</translate>:</th>
-        <td><input name="partnumber" size=20></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Part Description</translate>:</th>
-        <td><input name="description" size=40></td>
-       </tr>
-       <tr>
-        <th align="right" nowrap><translate>Charge Number</translate>:</th>
-        <td><input name="chargenumber" size=40></td>
-       </tr>
-       [% IF conf_show_best_before %]
-       <tr>
-        <th align="right" nowrap><translate>Best Before</translate>:</th>
-        <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-        </td>
-       </tr>
-       [% END %]
-       <tr>
-        <th align="right" nowrap><translate>Qty in stock</translate>:</th>
-        <td>
-         <select name="qty_op">
-          <option value="dontcare">---</option>
-          <option value="atleast"><translate>At least</translate></option>
-          <option value="atmost"><translate>At most</translate></option>
-          <option value="exact"><translate>Exact</translate></option>
-         </select>
-         <input name="qty">
-         <select name="qty_unit">
-          [%- FOREACH unit = UNITS %]<option>[% unit.name %]</option>[% END %]
-         </select>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr height="5"><td>&nbsp;</td></tr>
-
-    <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Include in Report</translate></th>
-    </tr>
-
-    <tr>
-     <td>
-      <input name="l_partdescription" type="hidden" value="Y">
-      <input name="l_qty" type="hidden" value="Y">
-
-      <table>
-       <tr>
-        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription"><translate>Warehouse</translate></label></td>
-        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription"><translate>Bin</translate></label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber"><translate>Part Number</translate></label></td>
-        <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber"><translate>Charge Number</translate></label></td>
-        [% IF conf_show_best_before %]
-        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore"><translate>Best Before</translate></label></td>
-        [% END %]
-       </tr>
-
-       <tr><td colspan="4"><hr noshade height="1"></td></tr>
-
-       <tr>
-        <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="subtotal"><translate>Subtotal</translate></label></td>
-        <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="include_empty_bins"><translate>Include empty bins</translate></label></td>
-       </tr>
-
-       <tr>
-        <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_stock_value"><translate>Stock value</translate></label></td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/transfer_parts_selection.html b/templates/webpages/wh/transfer_parts_selection.html
new file mode 100644 (file)
index 0000000..6ef7eda
--- /dev/null
@@ -0,0 +1,129 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+
+ <script type="text/javascript">
+  <!--
+      warehouses = new Array();
+      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(row, index) {
+        var cname = "dst_bin_id_" + row;
+        var control = document.getElementById(cname);
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        for (i = 0; i < warehouses[index].length; i++) {
+          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
+        }
+
+        control.options[0].selected = true;
+      }
+
+      function on_load() {
+        [% FOREACH row = CONTENTS %]
+        warehouse_selected([% loop.count %], [% initial_warehouse_idx %]);
+        [% END %]
+      }
+    -->
+ </script>
+
+ <form method="post" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="transfer_parts">
+  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <p>[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]</p>
+
+  <p>
+   <table>
+    <tr>
+     <td>[% 'Select type of transfer' | $T8 %]:</td>
+     <td>
+      <select name="transfer_type_id">
+       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <td>[% 'Optional comment' | $T8 %]:</td>
+     <td><input name="comment" size="20"></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <table>
+    <tr>
+     <th class="listheading">[% 'Source bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Transfer qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Destination warehouse and bin' | $T8 %]</th>
+    </tr>
+
+    [% FOREACH row = CONTENTS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
+     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
+     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
+     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
+     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     [% IF conf_show_best_before %]
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+     [% END %]
+     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
+     <td>[% HTML.escape(row.bindescription) %]</td>
+     <td>[% HTML.escape(row.partnumber) %]</td>
+     <td>[% HTML.escape(row.partdescription) %]</td>
+     <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
+     <td>[% HTML.escape(row.ean) %]</td>
+     <td>[% HTML.escape(row.qty) %]</td>
+     <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
+     <td>
+      <select name="unit_[% loop.count %]">
+       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
+      </select>
+     </td>
+
+     <td>
+      <select name="dst_warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
+       [% FOREACH wh = WAREHOUSES %]<option value="[% HTML.escape(wh.id) %]"[% IF wh.selected %] selected[% END %]>[% HTML.escape(wh.description) %]</option>[% END %]
+      </select>
+     </td>
+     <td><select id="dst_bin_id_[% loop.count %]" name="dst_bin_id_[% loop.count %]"></select></td>
+    </tr>
+
+    [% END %]
+
+    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
+
+   </table>
+  </p>
+
+  <hr size="3" noshade>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/wh/transfer_parts_selection_de.html b/templates/webpages/wh/transfer_parts_selection_de.html
deleted file mode 100644 (file)
index 704a205..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index) {
-        var cname = "dst_bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        control.options[0].selected = true;
-      }
-
-      function on_load() {
-        [% FOREACH row = CONTENTS %]
-        warehouse_selected([% loop.count %], [% initial_warehouse_idx %]);
-        [% END %]
-      }
-    -->
- </script>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Quelllager: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td>Grund der Umlagerung ausw&auml;hlen:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td>Optionaler Kommentar:</td>
-     <td><input name="comment" size="20"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Quelllagerplatz</th>
-     <th class="listheading">Artikelnummer</th>
-     <th class="listheading">Artikelbeschreibung</th>
-     <th class="listheading">Chargennummer</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
-     [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Lagerbestand</th>
-     <th class="listheading" colspan="2">Umlagermenge</th>
-     <th class="listheading" colspan="2">Ziellager und -lagerplatz</th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td>
-      <select name="dst_warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [% FOREACH wh = WAREHOUSES %]<option value="[% HTML.escape(wh.id) %]"[% IF wh.selected %] selected[% END %]>[% HTML.escape(wh.description) %]</option>[% END %]
-      </select>
-     </td>
-     <td><select id="dst_bin_id_[% loop.count %]" name="dst_bin_id_[% loop.count %]"></select></td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/transfer_parts_selection_en.html b/templates/webpages/wh/transfer_parts_selection_en.html
deleted file mode 100644 (file)
index 2915609..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index) {
-        var cname = "dst_bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        control.options[0].selected = true;
-      }
-
-      function on_load() {
-        [% FOREACH row = CONTENTS %]
-        warehouse_selected([% loop.count %], [% initial_warehouse_idx %]);
-        [% END %]
-      }
-    -->
- </script>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p>Transfer from warehouse: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td>Select type of transfer:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td>Optional comment:</td>
-     <td><input name="comment" size="20"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading">Source bin</th>
-     <th class="listheading">Part Number</th>
-     <th class="listheading">Part Description</th>
-     <th class="listheading">Charge Number</th>
-     [% IF conf_show_best_before %]
-     <th class="listheading">Best Before</th>
-     [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Available qty</th>
-     <th class="listheading" colspan="2">Transfer qty</th>
-     <th class="listheading" colspan="2">Destination warehouse and bin</th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td>
-      <select name="dst_warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [% FOREACH wh = WAREHOUSES %]<option value="[% HTML.escape(wh.id) %]"[% IF wh.selected %] selected[% END %]>[% HTML.escape(wh.description) %]</option>[% END %]
-      </select>
-     </td>
-     <td><select id="dst_bin_id_[% loop.count %]" name="dst_bin_id_[% loop.count %]"></select></td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/transfer_parts_selection_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
deleted file mode 100644 (file)
index cbe2429..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(row, index) {
-        var cname = "dst_bin_id_" + row;
-        var control = document.getElementById(cname);
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        for (i = 0; i < warehouses[index].length; i++) {
-          control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
-        }
-
-        control.options[0].selected = true;
-      }
-
-      function on_load() {
-        [% FOREACH row = CONTENTS %]
-        warehouse_selected([% loop.count %], [% initial_warehouse_idx %]);
-        [% END %]
-      }
-    -->
- </script>
-
- <form method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_parts">
-  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
-
-  <div class="listtop">[% title %]</div>
-
-  <p><translate>Transfer from warehouse</translate>: [% warehouse_description %]</p>
-
-  <p>
-   <table>
-    <tr>
-     <td><translate>Select type of transfer</translate>:</td>
-     <td>
-      <select name="transfer_type_id">
-       [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <td><translate>Optional comment</translate>:</td>
-     <td><input name="comment" size="20"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th class="listheading"><translate>Source bin</translate></th>
-     <th class="listheading"><translate>Part Number</translate></th>
-     <th class="listheading"><translate>Part Description</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
-     [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
-     [% END %]
-     <th class="listheading"><translate>EAN</translate></th>
-     <th class="listheading"><translate>Available qty</translate></th>
-     <th class="listheading" colspan="2"><translate>Transfer qty</translate></th>
-     <th class="listheading" colspan="2"><translate>Destination warehouse and bin</translate></th>
-    </tr>
-
-    [% FOREACH row = CONTENTS %]
-    <tr class="listrow[% loop.count % 2 %]">
-     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
-     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
-     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
-     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
-     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-     [% IF conf_show_best_before %]
-     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
-     [% END %]
-     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
-     <td>[% HTML.escape(row.partnumber) %]</td>
-     <td>[% HTML.escape(row.partdescription) %]</td>
-     <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
-     <td>[% HTML.escape(row.bestbefore) %]</td>
-     [% END %]
-     <td>[% HTML.escape(row.ean) %]</td>
-     <td>[% HTML.escape(row.qty) %]</td>
-     <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
-     <td>
-      <select name="unit_[% loop.count %]">
-       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-
-     <td>
-      <select name="dst_warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
-       [% FOREACH wh = WAREHOUSES %]<option value="[% HTML.escape(wh.id) %]"[% IF wh.selected %] selected[% END %]>[% HTML.escape(wh.description) %]</option>[% END %]
-      </select>
-     </td>
-     <td><select id="dst_bin_id_[% loop.count %]" name="dst_bin_id_[% loop.count %]"></select></td>
-    </tr>
-
-    [% END %]
-
-    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
-
-   </table>
-  </p>
-
-  <hr size="3" noshade>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection.html b/templates/webpages/wh/warehouse_selection.html
new file mode 100644 (file)
index 0000000..afdc7a4
--- /dev/null
@@ -0,0 +1,157 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[% USE JavaScript %]<body onload="on_load();">
+
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/part_selection.js"></script>
+ <script type="text/javascript">
+   <!--
+      warehouses = new Array();
+      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
+      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(warehouse_id, bin_id) {
+        var control = document.getElementById("bin_id");
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        var warehouse_index = 0;
+
+        for (i = 0; i < warehouses.length; i++)
+          if (warehouses[i]['id'] == warehouse_id) {
+            warehouse_index = i;
+            break;
+          }
+
+        var warehouse = warehouses[warehouse_index];
+        var bin_index = 0;
+
+        for (i = 0; i < warehouse['bins'].length; i++)
+          if (warehouse['bins'][i]['id'] == bin_id) {
+            bin_index = i;
+            break;
+          }
+
+        for (i = 0; i < warehouse['bins'].length; i++) {
+          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+        }
+
+
+        control.options[bin_index].selected = true;
+      }
+
+      function on_load() {
+        warehouse_selected(0, 0);
+        document.Form.partnumber.focus();
+      }
+     -->
+ </script>
+
+ <form name="Form" method="post" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
+
+  [% IF saved_message %]
+  <p>[% saved_message %]</p>
+  [% END %]
+
+  <div class="listtop">[% title %]</div>
+
+  <p>
+   [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
+  </p>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right" nowrap>[% 'Transfer from warehouse' | $T8 %]:</th>
+     <td>
+      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+       [%- FOREACH warehouse = WAREHOUSES %]
+       <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
+     <td><select id="bin_id" name="bin_id"></select></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Limit part selection' | $T8 %]:</th>
+     <td></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
+     <td>
+      <input type="hidden" name="parts_id" id="parts_id">
+      <input name="partnumber" id="partnumber" size="30">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
+     <td>
+      <input name="description" size="30">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
+     <td><input name="chargenumber" size="30"></td>
+    </tr>
+
+    [% IF conf_show_best_before %]
+    <tr>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+    [% END %]
+
+    <tr>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
+     <td><input name="ean" size="30"></td>
+    </tr>
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+  </p>
+ </form>
+
+ [% IF conf_show_best_before %]
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/wh/warehouse_selection_assembly.html b/templates/webpages/wh/warehouse_selection_assembly.html
new file mode 100644 (file)
index 0000000..74da21a
--- /dev/null
@@ -0,0 +1,159 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
+
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/part_selection.js"></script>
+ <script type="text/javascript">
+  <!--
+      warehouses = new Array();
+      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(warehouse_id, bin_id) {
+        var control = document.getElementById("bin_id");
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        var warehouse_index = 0;
+
+        for (i = 0; i < warehouses.length; i++)
+          if (warehouses[i]['id'] == warehouse_id) {
+            warehouse_index = i;
+            break;
+          }
+
+        var warehouse = warehouses[warehouse_index];
+        var bin_index = 0;
+
+        for (i = 0; i < warehouse['bins'].length; i++)
+          if (warehouse['bins'][i]['id'] == bin_id) {
+            bin_index = i;
+            break;
+          }
+
+        for (i = 0; i < warehouse['bins'].length; i++) {
+          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+        }
+
+
+        control.options[bin_index].selected = true;
+      }
+
+      function on_load() {
+        warehouse_selected([% warehouse_id %], [% bin_id %]);
+      }
+    -->
+ </script>
+
+ <form name="Form" method="post" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="transfer_assembly">
+  <input type="hidden" name="update_nextsub" value="transfer_assembly_update_part">
+
+  [% IF saved_message %]
+  <p>[% saved_message %]</p>
+  [% END %]
+
+  <div class="listtop">[% title %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
+     <td>
+      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+       [%- FOREACH warehouse = WAREHOUSES %]
+       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
+     <td><select id="bin_id" name="bin_id"></select></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Assembly Number' | $T8 %]</th>
+     <td>
+      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
+      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
+      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Assembly Description' | $T8 %]</th>
+     <td>
+      <input name="description" size="30" value="[% HTML.escape(description) %]">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
+     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
+    </tr>
+
+    [% IF conf_show_best_before %]
+    <tr>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+    [% END %]
+
+    <tr>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
+     <td>
+      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
+      <select name="unit">
+       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
+     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
+    </tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+   [%- IF parts_id %]
+   <input type="submit" class="submit" name="action" value="[% 'Create Assembly' | $T8 %]">
+   [%- END %]
+  </p>
+ </form>
+
+ [% IF conf_show_best_before %]
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+ [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/wh/warehouse_selection_assembly_de.html b/templates/webpages/wh/warehouse_selection_assembly_de.html
deleted file mode 100644 (file)
index 5f85a3e..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_assembly">
-  <input type="hidden" name="update_nextsub" value="transfer_assembly_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Ziellager</th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Ziellagerplatz:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Erzeugnis-Nummer</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Erzeugnis-Beschreibung</th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Chargennummer</th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>Menge</th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Optionaler Kommentar</th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Erneuern">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Erzeugnis fertigen">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_assembly_en.html b/templates/webpages/wh/warehouse_selection_assembly_en.html
deleted file mode 100644 (file)
index ddbdcd6..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_assembly">
-  <input type="hidden" name="update_nextsub" value="transfer_assembly_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Destination warehouse</th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Destination bin:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Assembly Number</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Assembly Description</th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Charge number</th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Best Before</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>Quantity</th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Optional comment</th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Update">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Create Assembly">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_assembly_master.html b/templates/webpages/wh/warehouse_selection_assembly_master.html
deleted file mode 100644 (file)
index 7272fe8..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_assembly">
-  <input type="hidden" name="update_nextsub" value="transfer_assembly_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap><translate>Destination warehouse</translate></th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Destination bin</translate>:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Assembly Number</translate></th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Assembly Description</translate></th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap><translate>Quantity</translate></th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Optional comment</translate></th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="<translate>Update</translate>">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="<translate>Create Assembly</translate>">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_de.html b/templates/webpages/wh/warehouse_selection_de.html
deleted file mode 100644 (file)
index fc61a5e..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   Wenn Sie f&uuml;r die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerpl&auml;tze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Quelllager:</th>
-     <td>
-      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Lagerplatz:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelauswahl eingrenzen:</th>
-     <td></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelnummer</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id">
-      <input name="partnumber" id="partnumber" size="30">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
-     <td>
-      <input name="description" size="30">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Chargennummer</th>
-     <td><input name="chargenumber" size="30"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>EAN</th>
-     <td><input name="ean" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_en.html b/templates/webpages/wh/warehouse_selection_en.html
deleted file mode 100644 (file)
index 6266915..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Transfer from warehouse:</th>
-     <td>
-      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Bin:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Limit part selection:</th>
-     <td></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Part Number</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id">
-      <input name="partnumber" id="partnumber" size="30">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Part Description</th>
-     <td>
-      <input name="description" size="30">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Charge number</th>
-     <td><input name="chargenumber" size="30"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Best Before</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>EAN</th>
-     <td><input name="ean" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="Continue">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_master.html b/templates/webpages/wh/warehouse_selection_master.html
deleted file mode 100644 (file)
index e070a46..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-   <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected(0, 0);
-        document.Form.partnumber.focus();
-      }
-     -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="[% HTML.escape(nextsub) %]">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <translate>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.</translate>
-  </p>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap><translate>Transfer from warehouse</translate>:</th>
-     <td>
-      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Bin</translate>:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Limit part selection</translate>:</th>
-     <td></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id">
-      <input name="partnumber" id="partnumber" size="30">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
-     <td>
-      <input name="description" size="30">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
-     <td><input name="chargenumber" size="30"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap><translate>EAN</translate></th>
-     <td><input name="ean" size="30"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_stock.html b/templates/webpages/wh/warehouse_selection_stock.html
new file mode 100644 (file)
index 0000000..ca164a5
--- /dev/null
@@ -0,0 +1,164 @@
+[%- USE T8 %]
+[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
+
+ <script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript" src="js/part_selection.js"></script>
+ <script type="text/javascript">
+  <!--
+      warehouses = new Array();
+      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
+      [% END %]
+      [% END %]
+
+      function warehouse_selected(warehouse_id, bin_id) {
+        var control = document.getElementById("bin_id");
+
+        for (var i = control.options.length - 1; i >= 0; i--) {
+          control.options[i] = null;
+        }
+
+        var warehouse_index = 0;
+
+        for (i = 0; i < warehouses.length; i++)
+          if (warehouses[i]['id'] == warehouse_id) {
+            warehouse_index = i;
+            break;
+          }
+
+        var warehouse = warehouses[warehouse_index];
+        var bin_index = 0;
+
+        for (i = 0; i < warehouse['bins'].length; i++)
+          if (warehouse['bins'][i]['id'] == bin_id) {
+            bin_index = i;
+            break;
+          }
+
+        for (i = 0; i < warehouse['bins'].length; i++) {
+          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+        }
+
+
+        control.options[bin_index].selected = true;
+      }
+
+      function on_load() {
+        warehouse_selected([% warehouse_id %], [% bin_id %]);
+      }
+    -->
+ </script>
+
+ <form name="Form" method="post" action="wh.pl">
+
+  <input type="hidden" name="nextsub" value="transfer_stock">
+  <input type="hidden" name="update_nextsub" value="transfer_stock_update_part">
+
+  [% IF saved_message %]
+  <p>[% saved_message %]</p>
+  [% END %]
+
+  <div class="listtop">[% title %]</div>
+
+  <p>
+   <table>
+    <tr>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
+     <td>
+      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+       [%- FOREACH warehouse = WAREHOUSES %]
+       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
+     <td><select id="bin_id" name="bin_id"></select></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
+     <td>
+      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
+      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
+      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
+     <td>
+      <input name="description" size="30" value="[% HTML.escape(description) %]">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
+     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
+    </tr>
+
+    [% IF conf_show_best_before %]
+    <tr>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+    [% END %]
+
+    <tr>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
+     <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
+     <td>
+      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
+      <select name="unit">
+       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
+     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
+    </tr>
+
+   </table>
+  </p>
+
+  <p>
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+   [%- IF parts_id %]
+   <input type="submit" class="submit" name="action" value="[% 'Stock' | $T8 %]">
+   [%- END %]
+  </p>
+ </form>
+
+ [% IF conf_show_best_before %]
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+  [% END %]
+
+</body>
+</html>
diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html
deleted file mode 100644 (file)
index 8ca133e..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_stock">
-  <input type="hidden" name="update_nextsub" value="transfer_stock_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Ziellager</th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Ziellagerplatz:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelnummer</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Chargennummer</th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>EAN</th>
-     <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Menge</th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Optionaler Kommentar</th>
-     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Erneuern">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Einlagern">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
-  [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_stock_en.html b/templates/webpages/wh/warehouse_selection_stock_en.html
deleted file mode 100644 (file)
index 559efc8..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_stock">
-  <input type="hidden" name="update_nextsub" value="transfer_stock_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap>Destination warehouse</th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Destination bin:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Part Number</th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Part Description</th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Charge number</th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap>Best Before</th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap>EAN</th>
-     <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Quantity</th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap>Optional comment</th>
-     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Update">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Stock">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
-  [% END %]
-
-</body>
-</html>
diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
deleted file mode 100644 (file)
index e8b072c..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-[% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
-
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/part_selection.js"></script>
- <script type="text/javascript">
-  <!--
-      warehouses = new Array();
-      [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %][%- FOREACH warehouse = WAREHOUSES_it %]
-      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
-      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
-      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
-      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
-      [% END %]
-      [% END %]
-
-      function warehouse_selected(warehouse_id, bin_id) {
-        var control = document.getElementById("bin_id");
-
-        for (var i = control.options.length - 1; i >= 0; i--) {
-          control.options[i] = null;
-        }
-
-        var warehouse_index = 0;
-
-        for (i = 0; i < warehouses.length; i++)
-          if (warehouses[i]['id'] == warehouse_id) {
-            warehouse_index = i;
-            break;
-          }
-
-        var warehouse = warehouses[warehouse_index];
-        var bin_index = 0;
-
-        for (i = 0; i < warehouse['bins'].length; i++)
-          if (warehouse['bins'][i]['id'] == bin_id) {
-            bin_index = i;
-            break;
-          }
-
-        for (i = 0; i < warehouse['bins'].length; i++) {
-          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
-        }
-
-
-        control.options[bin_index].selected = true;
-      }
-
-      function on_load() {
-        warehouse_selected([% warehouse_id %], [% bin_id %]);
-      }
-    -->
- </script>
-
- <form name="Form" method="post" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="transfer_stock">
-  <input type="hidden" name="update_nextsub" value="transfer_stock_update_part">
-
-  [% IF saved_message %]
-  <p>[% saved_message %]</p>
-  [% END %]
-
-  <div class="listtop">[% title %]</div>
-
-  <p>
-   <table>
-    <tr>
-     <th align="right" nowrap><translate>Destination warehouse</translate></th>
-     <td>
-      <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
-       [%- FOREACH warehouse = WAREHOUSES %]
-       <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
-       [%- END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Destination bin</translate>:</th>
-     <td><select id="bin_id" name="bin_id"></select></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
-     <td>
-      <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
-      <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
-      <input name="partnumber" size="30" value="[% HTML.escape(partnumber) %]">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
-     <td>
-      <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
-     <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
-    </tr>
-
-    [% IF conf_show_best_before %]
-    <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
-     <td>
-       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
-       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-     </td>
-    </tr>
-    [% END %]
-
-    <tr>
-     <th align="right" nowrap><translate>EAN</translate></th>
-     <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Quantity</translate></th>
-     <td>
-      <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
-      <select name="unit">
-       [%- FOREACH unit = UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
-      </select>
-     </td>
-    </tr>
-
-    <tr>
-     <th align="right" nowrap><translate>Optional comment</translate></th>
-     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
-    </tr>
-
-   </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="<translate>Update</translate>">
-   [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="<translate>Stock</translate>">
-   [%- END %]
-  </p>
- </form>
-
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
-  [% END %]
-
-</body>
-</html>