Templates werden nicht mehr explizit übersetzt: *_master in * umbenannt
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 11:12:43 +0000 (13:12 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 11:12:43 +0000 (13:12 +0200)
Ersetzt commit 6e77701e6cefdfe61861e82dd500f8d9582c482c.
Erzeugt durch:

  for file in `find templates | grep _master.html`; do git mv $file ${file/_master}; done

416 files changed:
templates/webpages/acctranscorrections/analyze_filter.html [new file with mode: 0644]
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_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_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_master.html [deleted file]
templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html [new file with mode: 0644]
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_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_master.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_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_master.html [deleted file]
templates/webpages/acctranscorrections/fix_wrong_taxkeys.html [new file with mode: 0644]
templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html [deleted file]
templates/webpages/admin/adminlogin.html [new file with mode: 0644]
templates/webpages/admin/adminlogin_master.html [deleted file]
templates/webpages/admin/backup_dataset.html [new file with mode: 0644]
templates/webpages/admin/backup_dataset_email_done.html [new file with mode: 0644]
templates/webpages/admin/backup_dataset_email_done_master.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_master.html [deleted file]
templates/webpages/admin/check_auth_tables.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/create_standard_group_ask.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/dbcreate.html [new file with mode: 0644]
templates/webpages/admin/dbcreate_master.html [deleted file]
templates/webpages/admin/dbdelete.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/dbupgrade_all_header.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/dbupgrade_header.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/delete_group_confirm.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/edit_group_membership.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/edit_user.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/restore_dataset.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/restore_dataset_start_header.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/update_dataset.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/admin/user_migration_done.html [new file with mode: 0644]
templates/webpages/admin/user_migration_done_master.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_master.html [deleted file]
templates/webpages/am/confirm_delete_warehouse.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/edit_defaults.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/edit_tax.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/edit_units.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/list_account_details.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/list_price_factors.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/am/list_warehouses.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/amcvar/list_cvar_configs.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/amcvar/render_inputs.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/amcvar/search_include.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ap/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ar/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/bankaccounts/bank_account_list_bottom.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/common/show_history.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ct/ajax_autocomplete.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ct/form_header.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ct/list_names_bottom.html [new file with mode: 0644]
templates/webpages/ct/list_names_bottom_master.html [deleted file]
templates/webpages/ct/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/SKR04_3804_already_exists.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_assemblies.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.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_master.html [deleted file]
templates/webpages/dbupgrade/buchungsgruppen_header.html [new file with mode: 0644]
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_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.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_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/buchungsgruppen_services_done_master.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_master.html [deleted file]
templates/webpages/dbupgrade/cp_greeting_update_form.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/footer.html [new file with mode: 0644]
templates/webpages/dbupgrade/footer_master.html [deleted file]
templates/webpages/dbupgrade/header.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/units_error.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/units_parts.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_parts_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_parts_done_master.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_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_services_done_master.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_done.html [new file with mode: 0644]
templates/webpages/dbupgrade/units_set_default_done_master.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_master.html [deleted file]
templates/webpages/dbupgrade/upgrade_message2.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dbupgrade/warning.html [new file with mode: 0644]
templates/webpages/dbupgrade/warning_master.html [deleted file]
templates/webpages/do/delete.html [new file with mode: 0644]
templates/webpages/do/delete_master.html [deleted file]
templates/webpages/do/form_footer.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/do/orders_bottom.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/do/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/do/stock_in_form.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/drafts/load.html [new file with mode: 0644]
templates/webpages/drafts/load_master.html [deleted file]
templates/webpages/drafts/save_new.html [new file with mode: 0644]
templates/webpages/drafts/save_new_master.html [deleted file]
templates/webpages/dunning/add.html [new file with mode: 0644]
templates/webpages/dunning/add_master.html [deleted file]
templates/webpages/dunning/edit_config.html [new file with mode: 0644]
templates/webpages/dunning/edit_config_master.html [deleted file]
templates/webpages/dunning/search.html [new file with mode: 0644]
templates/webpages/dunning/search_master.html [deleted file]
templates/webpages/dunning/set_email.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/dunning/show_dunning_top.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/fu/add_edit.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/fu/edit_access_rights.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/fu/report_for_todo_list.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/fu/search.html [new file with mode: 0644]
templates/webpages/fu/search_master.html [deleted file]
templates/webpages/generic/calculate_qty.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/generic/edit_email.html [new file with mode: 0644]
templates/webpages/generic/edit_email_master.html [deleted file]
templates/webpages/generic/error.html [new file with mode: 0644]
templates/webpages/generic/error_master.html [deleted file]
templates/webpages/generic/information.html [new file with mode: 0644]
templates/webpages/generic/information_master.html [deleted file]
templates/webpages/generic/new_item.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/generic/print_options.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/generic/select_part.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/generic/set_longdescription.html [new file with mode: 0644]
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_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_master.html [deleted file]
templates/webpages/gl/generate_report_bottom.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ic/assembly_row.html [new file with mode: 0644]
templates/webpages/ic/assembly_row_master.html [deleted file]
templates/webpages/ic/choice.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ic/form_footer.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ic/generate_report_bottom.html [new file with mode: 0644]
templates/webpages/ic/generate_report_bottom_master.html [deleted file]
templates/webpages/ic/makemodel.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ic/price_row.html [new file with mode: 0644]
templates/webpages/ic/price_row_master.html [deleted file]
templates/webpages/ic/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ir/_payments.html [new file with mode: 0644]
templates/webpages/ir/_payments_master.html [deleted file]
templates/webpages/ir/form_footer.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/is/_payments.html [new file with mode: 0644]
templates/webpages/is/_payments_master.html [deleted file]
templates/webpages/is/form_footer.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/login/auth_db_unreachable.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/login/company_logo.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/login/password_error.html [new file with mode: 0644]
templates/webpages/login/password_error_master.html [deleted file]
templates/webpages/menu/menunew.html [new file with mode: 0644]
templates/webpages/menu/menunew_master.html [deleted file]
templates/webpages/menu/menuv3.html [new file with mode: 0644]
templates/webpages/menu/menuv3_master.html [deleted file]
templates/webpages/menu/menuv4.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/oe/form_footer.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/oe/orders_bottom.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/oe/report_for_todo_list.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/oe/search.html [new file with mode: 0644]
templates/webpages/oe/search_master.html [deleted file]
templates/webpages/projects/project_form.html [new file with mode: 0644]
templates/webpages/projects/project_form_master.html [deleted file]
templates/webpages/projects/search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/report_generator/html_report.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/rp/aging_ar_bottom.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/rp/balance_sheet.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/sepa/bank_transfer_add.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/sepa/bank_transfer_created.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/sepa/bank_transfer_list_bottom.html [new file with mode: 0644]
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_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_master.html [deleted file]
templates/webpages/sepa/bank_transfer_search.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ustva/config_step1.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/ustva/generic_taxreport.html [new file with mode: 0644]
templates/webpages/ustva/generic_taxreport_master.html [deleted file]
templates/webpages/ustva/report.html [new file with mode: 0644]
templates/webpages/ustva/report_master.html [deleted file]
templates/webpages/webdav/_list.html [new file with mode: 0644]
templates/webpages/webdav/_list_master.html [deleted file]
templates/webpages/wh/journal_filter.html [new file with mode: 0644]
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_master.html [deleted file]
templates/webpages/wh/report_filter.html [new file with mode: 0644]
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_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_master.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_master.html [deleted file]

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_master.html b/templates/webpages/acctranscorrections/analyze_filter_master.html
deleted file mode 100644 (file)
index 867bbad..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/analyze_overview_master.html
deleted file mode 100644 (file)
index 883c4e7..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html
deleted file mode 100644 (file)
index 6115d92..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html
deleted file mode 100644 (file)
index a0fa658..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html
deleted file mode 100644 (file)
index 1195f28..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
deleted file mode 100644 (file)
index 430f0fc..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html
deleted file mode 100644 (file)
index c075471..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[%- 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_master.html b/templates/webpages/acctranscorrections/delete_transaction_master.html
deleted file mode 100644 (file)
index 2c461b0..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html
deleted file mode 100644 (file)
index f099928..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html
deleted file mode 100644 (file)
index ee0c244..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html
deleted file mode 100644 (file)
index 7a3f044..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/adminlogin_master.html
deleted file mode 100644 (file)
index e821874..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/admin/backup_dataset_email_done_master.html
deleted file mode 100644 (file)
index 68f31d7..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- 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_master.html b/templates/webpages/admin/backup_dataset_master.html
deleted file mode 100644 (file)
index 0737741..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/check_auth_database_master.html
deleted file mode 100644 (file)
index 4c55413..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/check_auth_tables_master.html
deleted file mode 100644 (file)
index 64ef01b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/create_dataset_master.html
deleted file mode 100644 (file)
index db60b3b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/create_standard_group_ask_master.html
deleted file mode 100644 (file)
index d5f680f..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/dbadmin_master.html
deleted file mode 100644 (file)
index 7533dcd..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/dbcreate_master.html
deleted file mode 100644 (file)
index 31fffca..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/dbdelete_master.html
deleted file mode 100644 (file)
index c3537da..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html
deleted file mode 100644 (file)
index b55a3d5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/admin/dbupgrade_footer_master.html
deleted file mode 100644 (file)
index 28e2856..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[%- USE T8 %]
-<p>[% '...done' | $T8 %]</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_master.html b/templates/webpages/admin/dbupgrade_header_master.html
deleted file mode 100644 (file)
index cc37049..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]<div class="listtop" width="100%">[% 'Dataset upgrade' | $T8 %] ([% 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_master.html b/templates/webpages/admin/delete_dataset_master.html
deleted file mode 100644 (file)
index 2062aed..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/delete_group_confirm_master.html
deleted file mode 100644 (file)
index 2f684a5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/edit_group_master.html
deleted file mode 100644 (file)
index 177fbc9..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/edit_group_membership_master.html
deleted file mode 100644 (file)
index 3792aa4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/edit_groups_master.html
deleted file mode 100644 (file)
index fcf034a..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- 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_user.html b/templates/webpages/admin/edit_user.html
new file mode 100644 (file)
index 0000000..81eb1ea
--- /dev/null
@@ -0,0 +1,282 @@
+[%- 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>
+
+      <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_master.html b/templates/webpages/admin/edit_user_master.html
deleted file mode 100644 (file)
index 81eb1ea..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-[%- 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>
-
-      <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/list_users.html b/templates/webpages/admin/list_users.html
new file mode 100644 (file)
index 0000000..6d7309f
--- /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_master.html b/templates/webpages/admin/list_users_master.html
deleted file mode 100644 (file)
index 6d7309f..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/restore_dataset_master.html
deleted file mode 100644 (file)
index ab7a94b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-[%- 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_start_footer.html b/templates/webpages/admin/restore_dataset_start_footer.html
new file mode 100644 (file)
index 0000000..c61a55e
--- /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 %]
+  [%- 'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' | $T8 %]
+ </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_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html
deleted file mode 100644 (file)
index c61a55e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[%- 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 %]
-  [%- 'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' | $T8 %]
- </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_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_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html
deleted file mode 100644 (file)
index ede5e7c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/test_db_connection_master.html
deleted file mode 100644 (file)
index 865efea..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/update_dataset_master.html
deleted file mode 100644 (file)
index 8d32086..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/admin/user_migration_complete_master.html
deleted file mode 100644 (file)
index 5f5114c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/admin/user_migration_done_master.html
deleted file mode 100644 (file)
index c20263c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[%- 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_master.html b/templates/webpages/admin/user_migration_master.html
deleted file mode 100644 (file)
index ef34e55..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/am/config_master.html
deleted file mode 100644 (file)
index 280db9d..0000000
+++ /dev/null
@@ -1,274 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/am/confirm_delete_warehouse_master.html
deleted file mode 100644 (file)
index 541b29a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/am/edit_accounts_master.html
deleted file mode 100644 (file)
index 6ccb7a2..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_defaults_master.html
deleted file mode 100644 (file)
index ff5cf04..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_price_factor_master.html
deleted file mode 100644 (file)
index 105f8b3..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_tax_master.html
deleted file mode 100644 (file)
index c495e69..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_templates_master.html
deleted file mode 100644 (file)
index 70f66fb..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_units_master.html
deleted file mode 100644 (file)
index 6494470..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/edit_warehouse_master.html
deleted file mode 100644 (file)
index c7ca819..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/am/list_account_details_master.html
deleted file mode 100644 (file)
index 884dc7d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/list_accounts_master.html
deleted file mode 100644 (file)
index 8392bf5..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/list_price_factors_master.html
deleted file mode 100644 (file)
index 73c9f31..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/list_tax_master.html
deleted file mode 100644 (file)
index 3d24b51..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/am/list_warehouses_master.html
deleted file mode 100644 (file)
index 843abe5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/amcvar/display_cvar_config_form_master.html
deleted file mode 100644 (file)
index 104b46f..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/amcvar/list_cvar_configs_master.html
deleted file mode 100644 (file)
index f2890f7..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/amcvar/render_inputs_master.html
deleted file mode 100644 (file)
index 335a77c..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- USE T8 %]
-[% USE HTML %]
-
-[%- SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) -%]
-
-[%- IF hide_non_editable && !var.flag_editable %]
-<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/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_master.html b/templates/webpages/amcvar/search_filter_master.html
deleted file mode 100644 (file)
index 0bf105e..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/ap/ap_transactions_bottom_master.html
deleted file mode 100644 (file)
index abc51a1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ap/search_master.html
deleted file mode 100644 (file)
index 4b11397..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ar/ar_transactions_bottom_master.html
deleted file mode 100644 (file)
index 57bacca..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ar/search_master.html
deleted file mode 100644 (file)
index cf8c70a..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/bankaccounts/bank_account_display_form_master.html
deleted file mode 100644 (file)
index 5ea2007..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
deleted file mode 100644 (file)
index eeab8cc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/common/search_history_master.html
deleted file mode 100644 (file)
index 0b28469..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/common/show_history_master.html
deleted file mode 100644 (file)
index 1b9b7e1..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/common/show_vc_details_master.html
deleted file mode 100644 (file)
index 49363ea..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/ct/form_footer_master.html
deleted file mode 100644 (file)
index 0fc5289..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/ct/form_header_master.html
deleted file mode 100644 (file)
index 71a2a16..0000000
+++ /dev/null
@@ -1,658 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ct/get_delivery_master.html
deleted file mode 100644 (file)
index 73d2154..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ct/list_names_bottom_master.html
deleted file mode 100644 (file)
index 0fd5389..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ct/search_master.html
deleted file mode 100644 (file)
index 7469774..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
deleted file mode 100644 (file)
index c4a3dc6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/dbupgrade/SKR04_3804_update_master.html
deleted file mode 100644 (file)
index 3850027..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- 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/buchungsgruppen_assemblies.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies.html
new file mode 100644 (file)
index 0000000..68abd3b
--- /dev/null
@@ -0,0 +1,145 @@
+[%- USE T8 %]
+[% 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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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_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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
deleted file mode 100644 (file)
index 226d645..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
deleted file mode 100644 (file)
index 68abd3b..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-[%- USE T8 %]
-[% 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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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_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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
deleted file mode 100644 (file)
index 0e5f94f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
deleted file mode 100644 (file)
index 5e962c9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[%- 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_parts.html b/templates/webpages/dbupgrade/buchungsgruppen_parts.html
new file mode 100644 (file)
index 0000000..36ffd37
--- /dev/null
@@ -0,0 +1,143 @@
+[%- 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="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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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_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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
deleted file mode 100644 (file)
index d93cb06..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
deleted file mode 100644 (file)
index 36ffd37..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-[%- 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="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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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_services.html b/templates/webpages/dbupgrade/buchungsgruppen_services.html
new file mode 100644 (file)
index 0000000..dd060bf
--- /dev/null
@@ -0,0 +1,144 @@
+[%- 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="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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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_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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
deleted file mode 100644 (file)
index a3d4f4f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
deleted file mode 100644 (file)
index dd060bf..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[%- 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="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">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</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/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_master.html b/templates/webpages/dbupgrade/coa_guess_master.html
deleted file mode 100644 (file)
index cec2c57..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
deleted file mode 100644 (file)
index b4cb334..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/error_master.html
deleted file mode 100644 (file)
index 4bcd9b0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/footer_master.html
deleted file mode 100644 (file)
index e4c312a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/header_master.html
deleted file mode 100644 (file)
index 09d840b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
deleted file mode 100644 (file)
index 0a31cbc..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/units_error_master.html
deleted file mode 100644 (file)
index d7019cb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/dbupgrade/units_header_master.html
deleted file mode 100644 (file)
index ef977a1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/dbupgrade/units_parts_done_master.html
deleted file mode 100644 (file)
index fcbf906..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/units_parts_master.html
deleted file mode 100644 (file)
index 99cfec1..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/dbupgrade/units_services_done_master.html
deleted file mode 100644 (file)
index 7de3335..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/units_services_master.html
deleted file mode 100644 (file)
index 26b60e8..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/dbupgrade/units_set_default_done_master.html
deleted file mode 100644 (file)
index 4dbf5c2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[%- 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_master.html b/templates/webpages/dbupgrade/units_set_default_master.html
deleted file mode 100644 (file)
index 285f11b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html
deleted file mode 100644 (file)
index 81bf7b8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html
deleted file mode 100644 (file)
index f704710..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-[% USE HTML %]<ul>
- <li>[% LxERP.t8('Applying #1:', file) | html %] [% 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_master.html b/templates/webpages/dbupgrade/warehouse_form_master.html
deleted file mode 100644 (file)
index 5edff88..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- 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/warning.html b/templates/webpages/dbupgrade/warning.html
new file mode 100644 (file)
index 0000000..6fd0d5e
--- /dev/null
@@ -0,0 +1,13 @@
+[%- 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>. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
+ </p>
+
+ <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]">
+</form>
diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
deleted file mode 100644 (file)
index 6fd0d5e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- 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>. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
- </p>
-
- <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]">
-</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_master.html b/templates/webpages/do/delete_master.html
deleted file mode 100644 (file)
index 9cd3592..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/do/form_footer_master.html
deleted file mode 100644 (file)
index b81ce8c..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/do/form_header_master.html
deleted file mode 100644 (file)
index 2f98575..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/do/orders_bottom_master.html
deleted file mode 100644 (file)
index 4138ca4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/do/search_master.html
deleted file mode 100644 (file)
index 811384c..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/do/stock_in_form_master.html
deleted file mode 100644 (file)
index 238747e..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/do/stock_out_form_master.html
deleted file mode 100644 (file)
index f9ffbba..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/drafts/load_master.html
deleted file mode 100644 (file)
index 13aae21..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/drafts/save_new_master.html
deleted file mode 100644 (file)
index aaf04ac..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dunning/add_master.html
deleted file mode 100644 (file)
index 9b6d4e2..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dunning/edit_config_master.html
deleted file mode 100644 (file)
index b539ad9..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dunning/search_master.html
deleted file mode 100644 (file)
index 6611df2..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dunning/set_email_master.html
deleted file mode 100644 (file)
index 1b96ed9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/dunning/show_dunning_bottom_master.html
deleted file mode 100644 (file)
index 8230082..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/dunning/show_invoices_master.html
deleted file mode 100644 (file)
index db6b1ad..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/fu/add_edit_master.html
deleted file mode 100644 (file)
index d32f3fc..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/fu/edit_access_rights_master.html
deleted file mode 100644 (file)
index 2c80715..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/fu/report_bottom_master.html
deleted file mode 100644 (file)
index 54927a7..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/fu/report_for_todo_list_master.html
deleted file mode 100644 (file)
index e818633..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/fu/search_master.html
deleted file mode 100644 (file)
index 63d8c0a..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/calculate_qty_master.html
deleted file mode 100644 (file)
index 974c78c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/cov_selection_master.html
deleted file mode 100644 (file)
index f3cdbcd..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/edit_email_master.html
deleted file mode 100644 (file)
index 9aec0ca..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/error_master.html
deleted file mode 100644 (file)
index 6282085..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/information_master.html
deleted file mode 100644 (file)
index 29e4171..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/new_item_master.html
deleted file mode 100644 (file)
index 1d3104a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/part_selection_master.html
deleted file mode 100644 (file)
index ac4aa4a..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/print_options_master.html
deleted file mode 100644 (file)
index f8ee3ef..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/select_delivery_customer_master.html
deleted file mode 100644 (file)
index 20858c1..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/generic/select_part_master.html
deleted file mode 100644 (file)
index 324c473..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/generic/select_vendor_master.html
deleted file mode 100644 (file)
index 35258df..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generic/set_longdescription_master.html
deleted file mode 100644 (file)
index 72b50cd..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/generictranslations/edit_greetings_master.html
deleted file mode 100644 (file)
index 345886a..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/gl/generate_report_bottom_master.html
deleted file mode 100644 (file)
index eb093a0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/ic/assembly_row_master.html
deleted file mode 100644 (file)
index c7f8d83..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/choice_master.html
deleted file mode 100644 (file)
index eb62525..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/confirm_price_update_master.html
deleted file mode 100644 (file)
index cc28548..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/form_footer_master.html
deleted file mode 100644 (file)
index b916011..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/ic/form_header_master.html
deleted file mode 100644 (file)
index 1063fa5..0000000
+++ /dev/null
@@ -1,293 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/generate_report_bottom_master.html
deleted file mode 100644 (file)
index 17d42af..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/makemodel_master.html
deleted file mode 100644 (file)
index 6412124..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/parts_language_selection_master.html
deleted file mode 100644 (file)
index 95ed20d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/price_row_master.html
deleted file mode 100644 (file)
index 09a7b6e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ic/search_master.html
deleted file mode 100644 (file)
index 25625a5..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/ic/search_update_prices_master.html
deleted file mode 100644 (file)
index a8ce648..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ir/_payments_master.html
deleted file mode 100644 (file)
index 179e65d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ir/form_footer_master.html
deleted file mode 100644 (file)
index 9e75178..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/ir/form_header_master.html
deleted file mode 100644 (file)
index c0260e8..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/is/form_footer_master.html
deleted file mode 100644 (file)
index 314e65a..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-[%- 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_header.html b/templates/webpages/is/form_header.html
new file mode 100644 (file)
index 0000000..0595413
--- /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 %]">
+
+<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' | $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_master.html b/templates/webpages/is/form_header_master.html
deleted file mode 100644 (file)
index 0595413..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-[%- 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 %]">
-
-<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' | $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/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_master.html b/templates/webpages/login/auth_db_unreachable_master.html
deleted file mode 100644 (file)
index bc3e11b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/login/authentication_pl_missing_master.html
deleted file mode 100644 (file)
index e9530b0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/login/company_logo_master.html
deleted file mode 100644 (file)
index a306456..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/login/login_screen_master.html
deleted file mode 100644 (file)
index 1c421fb..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/login/password_error_master.html
deleted file mode 100644 (file)
index e1060a0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/menu/menunew_master.html
deleted file mode 100644 (file)
index 89a897e..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/menu/menuv3_master.html
deleted file mode 100644 (file)
index 9da6236..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/menu/menuv4_master.html
deleted file mode 100644 (file)
index 4ae7d19..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/oe/check_for_direct_delivery_master.html
deleted file mode 100644 (file)
index 35a5135..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/oe/form_footer_master.html
deleted file mode 100644 (file)
index de6d7b9..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/oe/form_header_master.html
deleted file mode 100644 (file)
index ba6c9cc..0000000
+++ /dev/null
@@ -1,274 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/oe/orders_bottom_master.html
deleted file mode 100644 (file)
index 5ceb69c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/oe/report_for_todo_list_master.html
deleted file mode 100644 (file)
index 6b8a184..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/oe/sales_order_master.html
deleted file mode 100644 (file)
index dcde83a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/oe/search_master.html
deleted file mode 100644 (file)
index 90cb602..0000000
+++ /dev/null
@@ -1,277 +0,0 @@
-[%- USE HTML %]
-[%- USE T8 %]
-[%- USE LxERP %]
-[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
-[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
-<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/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_master.html b/templates/webpages/projects/project_form_master.html
deleted file mode 100644 (file)
index c27a254..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/projects/search_master.html
deleted file mode 100644 (file)
index e7b030c..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/report_generator/csv_export_options_master.html
deleted file mode 100644 (file)
index ee7f442..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/report_generator/html_report_master.html
deleted file mode 100644 (file)
index fa8874c..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/report_generator/pdf_export_options_master.html
deleted file mode 100644 (file)
index 41eb6c0..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/rp/aging_ar_bottom_master.html
deleted file mode 100644 (file)
index d148e22..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/rp/balance_sheet_master.html
deleted file mode 100644 (file)
index 1fd8d45..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/rp/html_report_susa_master.html
deleted file mode 100644 (file)
index c9b010a..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/sepa/bank_transfer_add_master.html
deleted file mode 100644 (file)
index 4aa4ab9..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/sepa/bank_transfer_create_master.html
deleted file mode 100644 (file)
index 318639e..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/sepa/bank_transfer_created_master.html
deleted file mode 100644 (file)
index d71ae55..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/sepa/bank_transfer_edit_master.html
deleted file mode 100644 (file)
index 28b17ed..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/sepa/bank_transfer_list_bottom_master.html
deleted file mode 100644 (file)
index 79f373f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-[%- 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_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_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_master.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
deleted file mode 100644 (file)
index 4d1a6dc..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/sepa/bank_transfer_search_master.html
deleted file mode 100644 (file)
index 306179f..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/todo/show_todo_list_master.html
deleted file mode 100644 (file)
index 8d6a137..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ustva/config_step1_master.html
deleted file mode 100644 (file)
index 0d1a74a..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-[%- 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_step2.html b/templates/webpages/ustva/config_step2.html
new file mode 100644 (file)
index 0000000..c8a5a8e
--- /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 userpreferences' | $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_master.html b/templates/webpages/ustva/config_step2_master.html
deleted file mode 100644 (file)
index c8a5a8e..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-[%- 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 userpreferences' | $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/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_master.html b/templates/webpages/ustva/generic_taxreport_master.html
deleted file mode 100644 (file)
index e5ee490..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/ustva/report_master.html
deleted file mode 100644 (file)
index a397e13..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-[%- 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/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_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_master.html b/templates/webpages/wh/journal_filter_master.html
deleted file mode 100644 (file)
index 83ba78b..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/wh/removal_parts_selection_master.html
deleted file mode 100644 (file)
index f156cb7..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/wh/report_filter_master.html
deleted file mode 100644 (file)
index e0ef887..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
deleted file mode 100644 (file)
index 6ef7eda..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-[%- 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/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_master.html b/templates/webpages/wh/warehouse_selection_assembly_master.html
deleted file mode 100644 (file)
index 74da21a..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-[%- 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_master.html b/templates/webpages/wh/warehouse_selection_master.html
deleted file mode 100644 (file)
index afdc7a4..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-[%- 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_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_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
deleted file mode 100644 (file)
index ca164a5..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-[%- 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>