From 30b3809896d60dfbf4eb4f3cc5baf8dc2bb61cb0 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 7 Dec 2006 14:22:24 +0000 Subject: [PATCH] =?utf8?q?Bearbeiten=20von=20Buchungsgruppen:=20Es=20wurde?= =?utf8?q?n=20nicht=20alle=20passenden=20Konten=20zur=20Auswahl=20der=20Er?= =?utf8?q?l=C3=B6s-=20und=20Aufwandskonten=20angeboten,=20sondern=20nur=20?= =?utf8?q?diejenigen,=20f=C3=BCr=20die=20chart.link=20"IC=5Fcogs"=20oder?= =?utf8?q?=20"IC=5Fsale"=20enthielten.=20Es=20fehlten=20die=20mit=20"IC=5F?= =?utf8?q?expense"=20und=20"IC=5Fincome".?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/am.pl | 63 ++++++++++++++++++----------------------------- locale/de/am | 33 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 39 deletions(-) diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 306cf6525..e7d7db206 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -40,6 +40,8 @@ use Data::Dumper; 1; +require "$form->{path}/common.pl"; + # end of main sub add { &{"add_$form->{type}"} } @@ -1887,46 +1889,29 @@ sub buchungsgruppe_header { # $locale->text('Buchungsgruppe hinzufügen') # $locale->text('Buchungsgruppe bearbeiten') - $form->{description} =~ s/\"/"/g; + my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {}); + my %acc_type_map = ( + "IC" => $acc_inventory, + "IC_income" => $acc_income, + "IC_sale" => $acc_income, + "IC_expense" => $acc_expense, + "IC_cogs" => $acc_expense, + ); - # build the popup menus - $form->{taxaccounts} = ""; - foreach $key (keys %{ $form->{IC_links} }) { + foreach $key (keys(%acc_type_map)) { foreach $ref (@{ $form->{IC_links}{$key} }) { - - # if this is a tax field - if ($key =~ /IC_tax/) { - if ($key =~ /$item/) { - $form->{taxaccounts} .= "$ref->{accno} "; - $form->{"IC_tax_$ref->{accno}_description"} = - "$ref->{accno}--$ref->{description}"; - - if ($form->{id}) { - if ($form->{amount}{ $ref->{accno} }) { - $form->{"IC_tax_$ref->{accno}"} = "checked"; - } - } else { - $form->{"IC_tax_$ref->{accno}"} = "checked"; - } - } - } else { - - $form->{"select$key"} .= - "" } + sort({ $a->{"accno"} cmp $b->{"accno"} } + values(%{$acc_type_map{$type}})))); + } if ($form->{id}) { $form->{selectIC} =~ s/selected//g; @@ -1947,10 +1932,10 @@ sub buchungsgruppe_header { } else { $linkaccounts = qq| {inventory_accno_id}>|; - } + } - $linkaccounts .= qq| + $linkaccounts .= qq| | . $locale->text('Erlöse Inland') . qq| @@ -2025,7 +2010,7 @@ sub buchungsgruppe_header { | . $locale->text('Buchungsgruppe') . qq| - + $linkaccounts
diff --git a/locale/de/am b/locale/de/am index 894bc0d4b..719ffe9d0 100644 --- a/locale/de/am +++ b/locale/de/am @@ -61,6 +61,7 @@ $self->{texts} = { 'Copy to COA' => 'In Kontenplan kopieren', 'Cost Center' => 'Kostenstelle', 'Credit' => 'Haben', + 'Customer Number' => 'Kundennummer', 'Customernumberinit' => 'Kundennummernkreis', 'Dataset upgrade' => 'Datenbankaktualisierung', 'Date Format' => 'Datumsformat', @@ -91,6 +92,7 @@ $self->{texts} = { 'Edit Template' => 'Vorlage bearbeiten', 'Edit Warehouse' => 'Lager bearbeiten', 'Enforce transaction reversal for all dates' => 'Gegenbuchungen für jeden Zeitraum aktualisieren', + 'Enter longdescription' => 'Langtext eingeben', 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' => 'Geben Sie Ihre und weitere Währungen mit bis zu drei Buchstaben pro Währung und Währungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)', 'Equity' => 'Passiva', 'Erlöse Ausland' => 'Erlöse Ausland', @@ -138,9 +140,16 @@ $self->{texts} = { 'Name' => 'Name', 'Netto Terms' => 'Zahlungsziel netto', 'No' => 'Nein', + 'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden', + 'No Vendor was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Händler gefunden', 'No email address for' => 'Keine eMailaddresse für', + 'No employee was found matching the search parameters.' => 'Es wurde kein Angestellter gefunden, auf den die Suchparameter zutreffen.', + 'No part was found matching the search parameters.' => 'Es wurde kein Artikel gefunden, auf den die Suchparameter zutreffen.', + 'No project was found matching the search parameters.' => 'Es wurde kein Projekt gefunden, auf das die Suchparameter zutreffen.', 'Number' => 'Nummer', 'Output Number Format' => 'Zahlenformat (Ausgabe)', + 'Part Number' => 'Artikelnummer', + 'Part description' => 'Artikelbeschreibung', 'Parts Inventory' => 'Warenliste', 'Password' => 'Passwort', 'Payables' => 'Verbindlichkeiten', @@ -149,6 +158,7 @@ $self->{texts} = { 'Payment Terms saved!' => 'Zahlungskonditionen gespeichert!', 'Payment terms deleted!' => 'Zahlungskonditionen gelöscht!', 'Phone' => 'Telefon', + 'Please enter values' => 'Bitte Werte eingeben', 'Preferences saved!' => 'Einstellungen gespeichert!', 'Printer' => 'Drucker', 'Printer Command' => 'Druckbefehl', @@ -157,6 +167,8 @@ $self->{texts} = { 'Printer deleted!' => 'Drucker gelöscht!', 'Printer saved!' => 'Drucker gespeichert!', 'Profit Center' => 'Erfolgsbereich', + 'Project Number' => 'Projektnummer', + 'Project description' => 'Projektbeschreibung', 'Ranking' => 'Ranking', 'Rate' => 'Rate', 'Receipt' => 'Zahlungseingang', @@ -167,6 +179,10 @@ $self->{texts} = { 'SIC saved!' => 'SIC gespeichert', 'Salesman' => 'Vertreter', 'Save' => 'Speichern', + 'Select a Customer' => 'Endkunde auswählen', + 'Select a part' => 'Artikel auswählen', + 'Select a project' => 'Projekt auswählen', + 'Select an employee' => 'Angestellten auswählen', 'Service Items' => 'Dienstleistungen', 'Setup Menu' => 'Menüsetup', 'Signature' => 'Unterschrift', @@ -238,6 +254,9 @@ $self->{texts} = { 'UStVA-Nr. 97 rechts' => 'Kz. 97 rechts', 'UStVA-Nr. 98' => 'Kz. 98', 'Umsatzsteuervoranmeldung' => 'Umsatzsteuervoranmeldung', + 'Unit' => 'Einheit', + 'Value' => 'Wert', + 'Variable' => 'Variable', 'Warehouse deleted!' => 'Das Lager wurde gelöscht.', 'Warehouse saved!' => 'Das Lager wurde gespeichert.', 'Warehouses' => 'Lager', @@ -252,6 +271,7 @@ $self->{texts} = { }; $self->{subs} = { + 'H' => 'H', 'acc_menu' => 'acc_menu', 'account_header' => 'account_header', 'add' => 'add', @@ -271,6 +291,7 @@ $self->{subs} = { 'backup' => 'backup', 'buchungsgruppe_header' => 'buchungsgruppe_header', 'business_header' => 'business_header', + 'calculate_qty' => 'calculate_qty', 'config' => 'config', 'continue' => 'continue', 'copy_to_coa' => 'copy_to_coa', @@ -286,6 +307,7 @@ $self->{subs} = { 'delete_printer' => 'delete_printer', 'delete_sic' => 'delete_sic', 'delete_warehouse' => 'delete_warehouse', + 'delivery_customer_selection' => 'delivery_customer_selection', 'department_header' => 'department_header', 'display' => 'display', 'display_form' => 'display_form', @@ -305,6 +327,7 @@ $self->{subs} = { 'edit_template' => 'edit_template', 'edit_units' => 'edit_units', 'edit_warehouse' => 'edit_warehouse', + 'employee_selection_internal' => 'employee_selection_internal', 'form_footer' => 'form_footer', 'gifi_footer' => 'gifi_footer', 'gifi_header' => 'gifi_header', @@ -321,13 +344,17 @@ $self->{subs} = { 'list_printer' => 'list_printer', 'list_sic' => 'list_sic', 'list_warehouse' => 'list_warehouse', + 'part_selection_internal' => 'part_selection_internal', 'payment_header' => 'payment_header', 'printer_header' => 'printer_header', + 'project_selection_internal' => 'project_selection_internal', + 'restore_form' => 'restore_form', 'save' => 'save', 'save_account' => 'save_account', 'save_buchungsgruppe' => 'save_buchungsgruppe', 'save_business' => 'save_business', 'save_department' => 'save_department', + 'save_form' => 'save_form', 'save_gifi' => 'save_gifi', 'save_language' => 'save_language', 'save_lead' => 'save_lead', @@ -339,7 +366,13 @@ $self->{subs} = { 'save_unit' => 'save_unit', 'save_warehouse' => 'save_warehouse', 'section_menu' => 'section_menu', + 'select_employee' => 'select_employee', + 'select_employee_internal' => 'select_employee_internal', + 'select_part' => 'select_part', + 'select_part_internal' => 'select_part_internal', + 'set_longdescription' => 'set_longdescription', 'sic_header' => 'sic_header', + 'vendor_selection' => 'vendor_selection', 'warehouse_header' => 'warehouse_header', 'erfassen' => 'add', 'konto_erfassen' => 'add_account', -- 2.20.1