From 0576299f2aa98125991c4ffcd2f75073ea583d7d Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 13 Sep 2005 13:53:56 +0000 Subject: [PATCH] Whitespace an den Zeilenenden entfernt. --- SL/AM.pm | 17 +++-- SL/CA.pm | 7 +- SL/Form.pm | 11 ++- SL/GL.pm | 9 ++- SL/IC.pm | 5 +- SL/IR.pm | 9 ++- SL/RC.pm | 9 ++- SL/RP.pm | 145 ++++++++++++++++++++-------------------- SL/USTVA.pm | 13 ++-- bin/mozilla/admin.pl | 21 +++--- bin/mozilla/am.pl | 25 ++++--- bin/mozilla/ap.pl | 21 +++--- bin/mozilla/ar.pl | 11 ++- bin/mozilla/ca.pl | 3 +- bin/mozilla/cp.pl | 3 +- bin/mozilla/ct.pl | 7 +- bin/mozilla/datev.pl | 18 ++--- bin/mozilla/gl.pl | 14 ++-- bin/mozilla/ic.pl | 11 ++- bin/mozilla/ir.pl | 13 ++-- bin/mozilla/is.pl | 9 ++- bin/mozilla/licenses.pl | 2 +- bin/mozilla/login.pl | 5 +- bin/mozilla/oe.pl | 25 ++++--- bin/mozilla/pe.pl | 3 +- bin/mozilla/rp.pl | 27 ++++---- bin/mozilla/ustva.pl | 59 ++++++++-------- 27 files changed, 239 insertions(+), 263 deletions(-) diff --git a/SL/AM.pm b/SL/AM.pm index 62406e74c..a06761c04 100644 --- a/SL/AM.pm +++ b/SL/AM.pm @@ -76,7 +76,7 @@ sub get_account { $sth->finish; # get taxkeys and description - $query = qq|SELECT taxkey, taxdescription + $query = qq|SELECT taxkey, taxdescription FROM tax|; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); @@ -163,7 +163,7 @@ sub save_account { WHERE id = $form->{id}|; } else { - $query = qq|INSERT INTO chart + $query = qq|INSERT INTO chart (accno, description, charttype, gifi_accno, category, link, taxkey_id, pos_ustva, pos_bwa, pos_bilanz,pos_eur) VALUES ('$form->{accno}', '$form->{description}', '$form->{charttype}', '$form->{gifi_accno}', @@ -251,7 +251,7 @@ sub delete_account { # set inventory_accno_id, income_accno_id, expense_accno_id to defaults $query = qq|UPDATE parts - SET inventory_accno_id = + SET inventory_accno_id = (SELECT inventory_accno_id FROM defaults) WHERE inventory_accno_id = $form->{id}|; $dbh->do($query) || $form->dberror($query); @@ -362,7 +362,7 @@ sub save_gifi { description = '$form->{description}' WHERE accno = '$form->{id}'|; } else { - $query = qq|INSERT INTO gifi + $query = qq|INSERT INTO gifi (accno, description) VALUES ('$form->{accno}', '$form->{description}')|; } @@ -570,7 +570,7 @@ sub save_department { role = '$form->{role}' WHERE id = $form->{id}|; } else { - $query = qq|INSERT INTO department + $query = qq|INSERT INTO department (description, role) VALUES ('$form->{description}', '$form->{role}')|; } @@ -670,7 +670,7 @@ sub save_business { salesman = '$form->{salesman}' WHERE id = $form->{id}|; } else { - $query = qq|INSERT INTO business + $query = qq|INSERT INTO business (description, discount, customernumberinit, salesman) VALUES ('$form->{description}', $form->{discount}, '$form->{customernumberinit}', '$form->{salesman}')|; } @@ -767,7 +767,7 @@ sub save_sic { description = '$form->{description}' WHERE code = '$form->{id}'|; } else { - $query = qq|INSERT INTO sic + $query = qq|INSERT INTO sic (code, sictype, description) VALUES ('$form->{code}', '$form->{sictype}', '$form->{description}')|; } @@ -847,7 +847,7 @@ sub save_preferences { # user specific variables are in myconfig # save defaults my $query = qq|UPDATE defaults SET - inventory_accno_id = + inventory_accno_id = (SELECT c.id FROM chart c WHERE c.accno = '$form->{inventory_accno}'), income_accno_id = @@ -1356,4 +1356,3 @@ sub closebooks { } 1; - diff --git a/SL/CA.pm b/SL/CA.pm index 2ab7e47b6..a96386063 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -369,7 +369,7 @@ sub all_transactions { $query .= qq| UNION ALL - + SELECT a.id, a.invnumber, c.name, a.transdate, a.invoice, ac.sellprice, 'ar' as module FROM ar a @@ -382,9 +382,9 @@ sub all_transactions { $todate_where $dpt_where $project - + UNION ALL - + SELECT a.id, a.invnumber, v.name, a.transdate, a.invoice, ac.sellprice, 'ap' as module FROM ap a @@ -451,4 +451,3 @@ sub all_transactions { } 1; - diff --git a/SL/Form.pm b/SL/Form.pm index c7595ac4f..ebc7e82f8 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -439,7 +439,7 @@ sub write_trigger { + //--> |; @@ -1300,7 +1300,7 @@ sub get_contact { my ($self, $dbh, $id) = @_; my $query = qq|SELECT c.* - FROM contacts c + FROM contacts c WHERE cp_id=$id|; $sth = $dbh->prepare($query); $sth->execute || $self->dberror($query); @@ -1319,8 +1319,8 @@ sub get_contacts { my ($self, $dbh, $id) = @_; - my $query = qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname - FROM contacts c + my $query = qq|SELECT c.cp_id, c.cp_cv_id, c.cp_name, c.cp_givenname + FROM contacts c WHERE cp_cv_id=$id|; my $sth = $dbh->prepare($query); $sth->execute || $self->dberror($query); @@ -1687,7 +1687,7 @@ sub lastname_used { $where = "quotation = '1'"; } - my $query = qq|SELECT id FROM $arap + my $query = qq|SELECT id FROM $arap WHERE id IN (SELECT MAX(id) FROM $arap WHERE $where AND ${table}_id > 0)|; @@ -2211,4 +2211,3 @@ sub parse_date { } 1; - diff --git a/SL/GL.pm b/SL/GL.pm index 9ae3835dc..9fdb486f9 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -124,7 +124,7 @@ sub post_transaction { if ($form->{id}) { # delete individual transactions - $query = qq|DELETE FROM acc_trans + $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|; $dbh->do($query) || $form->dberror($query); @@ -149,7 +149,7 @@ sub post_transaction { my ($null, $department_id) = split /--/, $form->{department}; $department_id *= 1; - $query = qq|UPDATE gl SET + $query = qq|UPDATE gl SET reference = '$form->{reference}', description = '$form->{description}', notes = '$form->{notes}', @@ -584,8 +584,8 @@ sub transaction { $query = "SELECT g.reference, g.description, g.notes, g.transdate, d.description AS department, e.name as employee, g.taxincluded, g.gldate FROM gl g - LEFT JOIN department d ON (d.id = g.department_id) - LEFT JOIN employee e ON (e.id = g.employee_id) + LEFT JOIN department d ON (d.id = g.department_id) + LEFT JOIN employee e ON (e.id = g.employee_id) WHERE g.id = $form->{id}"; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); @@ -722,4 +722,3 @@ sub debug { } 1; - diff --git a/SL/IC.pm b/SL/IC.pm index 036a66909..ed74db66a 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -300,7 +300,7 @@ sub save { ($partsgroup, $partsgroup_id) = split /--/, $form->{partsgroup}; } - $query = qq|UPDATE parts SET + $query = qq|UPDATE parts SET partnumber = '$form->{partnumber}', description = '$form->{description}', makemodel = '$form->{makemodel}', @@ -350,7 +350,7 @@ sub save { foreach $item (split / /, $form->{taxaccounts}) { if ($form->{"IC_tax_$item"}) { $query = qq|INSERT INTO partstax (parts_id, chart_id) - VALUES ($form->{id}, + VALUES ($form->{id}, (SELECT c.id FROM chart c WHERE c.accno = '$item'))|; @@ -1287,4 +1287,3 @@ sub retrieve_item { } 1; - diff --git a/SL/IR.pm b/SL/IR.pm index a02f4fbd9..f6cf8b6a0 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -235,17 +235,17 @@ sub post_invoice { # add entry for inventory, this one is for the sold item if ($linetotal != 0) { - $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, + $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) VALUES ($ref->{trans_id}, $ref->{inventory_accno_id}, $linetotal, '$ref->{transdate}')|; $dbh->do($query) || $form->dberror($query); # add expense - $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, + $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) VALUES ($ref->{trans_id}, $ref->{expense_accno_id}, - | . ($linetotal * -1) . qq|, '$ref->{transdate}', + | . ($linetotal * -1) . qq|, '$ref->{transdate}', (SELECT taxkey from tax WHERE chart_id = $ref->{expense_accno_id}))|; $dbh->do($query) || $form->dberror($query); } @@ -443,7 +443,7 @@ sub post_invoice { $form->round_amount($form->{amount}{$trans_id}{$accno}, 2) ) != 0 ) { - $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, + $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) VALUES ($trans_id, (SELECT c.id FROM chart c WHERE c.accno = '$accno'), @@ -1220,4 +1220,3 @@ SWITCH: { } 1; - diff --git a/SL/RC.pm b/SL/RC.pm index f9e789161..63a41f434 100644 --- a/SL/RC.pm +++ b/SL/RC.pm @@ -117,11 +117,11 @@ sub payment_transactions { $query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate}; $query .= qq| - + UNION SELECT v.name, ac.source, ac.transdate, ac.cleared, ac.fx_transaction, ac.amount, a.id, - $oid{$myconfig->{dbdriver}} AS oid + $oid{$myconfig->{dbdriver}} AS oid FROM vendor v, acc_trans ac, ap a, chart ch WHERE v.id = a.vendor_id -- AND NOT ac.fx_transaction @@ -135,11 +135,11 @@ sub payment_transactions { $query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate}; $query .= qq| - + UNION SELECT g.description, ac.source, ac.transdate, ac.cleared, ac.fx_transaction, ac.amount, g.id, - $oid{$myconfig->{dbdriver}} AS oid + $oid{$myconfig->{dbdriver}} AS oid FROM gl g, acc_trans ac, chart ch WHERE g.id = ac.trans_id -- AND NOT ac.fx_transaction @@ -201,4 +201,3 @@ sub reconcile { } 1; - diff --git a/SL/RP.pm b/SL/RP.pm index 51b78b46b..7bd324bce 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -600,7 +600,7 @@ sub get_accounts { if ($form->{method} eq 'cash') { $query = qq| - + SELECT g.accno, sum(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -621,9 +621,9 @@ sub get_accounts { ) $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -667,9 +667,9 @@ sub get_accounts { ) $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -694,7 +694,7 @@ sub get_accounts { UNION ALL -- add gl - + SELECT g.accno, sum(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -709,9 +709,9 @@ sub get_accounts { AND NOT (c.link = 'AR' OR c.link = 'AP') $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -731,9 +731,9 @@ sub get_accounts { if ($form->{project_id}) { $query .= qq| - + UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, g.description AS description, c.category FROM invoice ac @@ -758,7 +758,7 @@ sub get_accounts { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, g.description AS description, c.category FROM invoice ac @@ -796,7 +796,7 @@ sub get_accounts { } $query = qq| - + SELECT g.accno, SUM(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -808,9 +808,9 @@ sub get_accounts { $category $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -827,9 +827,9 @@ sub get_accounts { if ($form->{project_id}) { $query .= qq| - + UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, g.description AS description, c.category FROM invoice ac @@ -846,7 +846,7 @@ sub get_accounts { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, g.description AS description, c.category FROM invoice ac @@ -870,7 +870,7 @@ sub get_accounts { if ($form->{method} eq 'cash') { $query = qq| - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -888,12 +888,12 @@ sub get_accounts { WHERE link LIKE '%AR_paid%' $subwhere ) - + $project GROUP BY c.accno, c.description, c.category - + UNION ALL - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -911,10 +911,10 @@ sub get_accounts { WHERE link LIKE '%AP_paid%' $subwhere ) - + $project GROUP BY c.accno, c.description, c.category - + UNION ALL SELECT c.accno, sum(ac.amount) AS amount, @@ -935,9 +935,9 @@ sub get_accounts { if ($form->{project_id}) { $query .= qq| - + UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, c.description AS description, c.category FROM invoice ac @@ -962,7 +962,7 @@ sub get_accounts { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice) AS amount, c.description AS description, c.category FROM invoice ac @@ -999,7 +999,7 @@ sub get_accounts { } $query = qq| - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -1015,9 +1015,9 @@ sub get_accounts { if ($form->{project_id}) { $query .= qq| - + UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, c.description AS description, c.category FROM invoice ac @@ -1033,7 +1033,7 @@ sub get_accounts { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, c.description AS description, c.category FROM invoice ac @@ -1156,7 +1156,7 @@ sub get_accounts_g { if ($form->{method} eq 'cash') { $query = qq| - + SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1173,12 +1173,12 @@ sub get_accounts_g { WHERE link LIKE '%AR_paid%' $subwhere ) - + $project GROUP BY c.$category - + UNION - + SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1195,10 +1195,10 @@ sub get_accounts_g { WHERE link LIKE '%AP_paid%' $subwhere ) - + $project GROUP BY c.$category - + UNION SELECT sum(ac.amount) AS amount, @@ -1218,9 +1218,9 @@ sub get_accounts_g { if ($form->{project_id}) { $query .= qq| - + UNION - + SELECT SUM(ac.sellprice * ac.qty) AS amount, c.$category FROM invoice ac @@ -1245,7 +1245,7 @@ sub get_accounts_g { GROUP BY c.$category UNION - + SELECT SUM(ac.sellprice) AS amount, c.$category FROM invoice ac @@ -1282,7 +1282,7 @@ sub get_accounts_g { } $query = qq| - + SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1297,9 +1297,9 @@ sub get_accounts_g { if ($form->{project_id}) { $query .= qq| - + UNION - + SELECT SUM(ac.sellprice * ac.qty) AS amount, c.$category FROM invoice ac @@ -1315,7 +1315,7 @@ sub get_accounts_g { GROUP BY c.$category UNION - + SELECT SUM(ac.sellprice * ac.qty) * -1 AS amount, c.$category FROM invoice ac @@ -1531,9 +1531,9 @@ sub trial_balance { $query .= qq| -- add project transactions from invoice - + UNION ALL - + SELECT g.accno, g.description, c.category, SUM(ac.sellprice * ac.qty) AS amount FROM invoice ac @@ -1548,7 +1548,7 @@ sub trial_balance { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno, g.description, c.category, SUM(ac.sellprice * ac.qty) * -1 AS amount FROM invoice ac @@ -1585,9 +1585,9 @@ sub trial_balance { $query .= qq| -- add project transactions from invoice - + UNION ALL - + SELECT c.accno, c.description, c.category, SUM(ac.sellprice * ac.qty) AS amount FROM invoice ac @@ -1601,7 +1601,7 @@ sub trial_balance { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno, c.description, c.category, SUM(ac.sellprice * ac.qty) * -1 AS amount FROM invoice ac @@ -1634,7 +1634,7 @@ sub trial_balance { $project AND ac.amount < 0 AND c.accno = ?) AS debit, - + (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) @@ -1657,7 +1657,7 @@ sub trial_balance { $project AND ac.amount < 0 AND c.gifi_accno = ?) AS debit, - + (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) @@ -1685,7 +1685,7 @@ sub trial_balance { $dpt_where $project AND c.accno = ?) AS debit, - + (SELECT SUM(ac.sellprice * ac.qty) FROM invoice ac JOIN parts p ON (ac.parts_id = p.id) @@ -1844,15 +1844,15 @@ sub aging { (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate <= (date '$form->{todate}' - interval '0 days') + transdate <= (date '$form->{todate}' - interval '0 days') AND transdate >= (date '$form->{todate}' - interval '30 days') ) - + UNION -- between 31-60 days @@ -1860,66 +1860,66 @@ sub aging { SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", (amount - paid) as "c30", 0.00 as "c60", 0.00 as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate FROM $form->{arap}, $form->{ct} - WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + WHERE paid != amount + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate < (date '$form->{todate}' - interval '30 days') + transdate < (date '$form->{todate}' - interval '30 days') AND transdate >= (date '$form->{todate}' - interval '60 days') ) UNION - + -- between 61-90 days SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", 0.00 as "c30", (amount - paid) as "c60", 0.00 as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate < (date '$form->{todate}' - interval '60 days') + transdate < (date '$form->{todate}' - interval '60 days') AND transdate >= (date '$form->{todate}' - interval '90 days') ) UNION - + -- over 90 days SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", 0.00 as "c30", 0.00 as "c60", (amount - paid) as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id - AND transdate < (date '$form->{todate}' - interval '90 days') + AND transdate < (date '$form->{todate}' - interval '90 days') ORDER BY - + ctid, transdate, invnumber - + |; my $sth = $dbh->prepare($query); @@ -2271,7 +2271,7 @@ sub payments { WHERE ac.chart_id = $ref->{id} $where $invnumber - + UNION SELECT g.description, g.reference, NULL AS ordnumber, ac.transdate, ac.amount * $ml AS paid, ac.source, @@ -2617,4 +2617,3 @@ sub income_statement { $main::lxdebug->leave_sub(); } 1; - diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 31d13caed..ff6355635 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -139,7 +139,7 @@ SWITCH: { - + |; my $h = 0; my $i = 0; @@ -191,7 +191,7 @@ sub fa_auswahl { #} #if ( $terminal eq 'mozilla' or $terminal eq 'js' ) { - print qq| + print qq|
@@ -261,7 +261,7 @@ sub fa_auswahl { print qq| Finanzamt - + |; $main::lxdebug->leave_sub(); @@ -410,7 +410,7 @@ sub query_finanzamt { if ($DBI::err) { #There is no table, read the table from sql/finanzamt.sql - print qq|

Bitte warten, Tabelle $table wird einmalig in Datenbank: + print qq|

Bitte warten, Tabelle $table wird einmalig in Datenbank: $myconfig->{dbname} als Benutzer: $myconfig->{dbuser} hinzugefügt...

|; process_query($form, $dbh, $filename) || $self->error(DBI->errstr); @@ -557,4 +557,3 @@ sub process_query { } 1; - diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index afd284bd9..566f29ac2 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -647,7 +647,7 @@ sub form_header { {"${item}_dbuser"}> | . $locale->text('Password') . qq| {"${item}_dbpasswd"}> - + |; } @@ -777,7 +777,7 @@ sub form_header { $webdav{"${directory}c"} = ""; } } - print qq| + print qq|
@@ -787,15 +787,15 @@ sub form_header { - + - + -
 Angebot Bestellung Bestellung  Rechnung
 Angebot Lieferantenbestellung Lieferantenbestellung  Einkaufsrechnung
+
@@ -1247,7 +1247,7 @@ sub dbselect_source { - + $form->{connectstring} @@ -1457,7 +1457,7 @@ sub create_dataset { $dbsources - + | . $locale->text('Create Dataset') . qq| @@ -1471,7 +1471,7 @@ sub create_dataset { - + | @@ -1480,7 +1480,7 @@ sub create_dataset { @charts - +

{dbdriver}> @@ -1598,7 +1598,7 @@ sub delete_dataset { $dbsources - +

{dbdriver}> @@ -1701,4 +1701,3 @@ sub lock_system { $form->redirect($locale->text('Lockfile created!')); } - diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index c21f482e2..20f1ad8d3 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -385,8 +385,8 @@ sub account_header { - - + + |; } @@ -944,9 +944,9 @@ sub list_department { print qq| - + - + |; $lxdebug->leave_sub(); @@ -1163,11 +1163,11 @@ sub list_business { } print qq| - + - + - + |; $lxdebug->leave_sub(); @@ -1216,7 +1216,7 @@ sub business_header { | . $locale->text('Salesman') . qq| {salesman}> - +

@@ -1376,9 +1376,9 @@ sub list_sic { print qq| - + - + |; $lxdebug->leave_sub(); @@ -2119,9 +2119,9 @@ sub list_warehouse { print qq| - + - + |; $lxdebug->leave_sub(); @@ -2199,4 +2199,3 @@ sub continue { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 77e9d368c..4b2d97448 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -392,7 +392,7 @@ sub form_header { {transdate}> $readonly text('button') - . qq|> + . qq|> |; $button2 = qq| {duedate}> $readonly @@ -504,7 +504,7 @@ sub form_header { -$jsscript +$jsscript |; $amount = $locale->text('Amount'); @@ -561,13 +561,13 @@ $jsscript {oldinvtotal}> {oldtotalpaid}> - + - + - + @@ -658,7 +658,7 @@ $jsscript print qq| {paidaccounts}> - +
| . $locale->text('Notes') . qq|
@@ -1446,18 +1446,18 @@ sub ap_transactions {
- +
{script}> - + - + {path}> {login}> {password}> - + @@ -1517,4 +1517,3 @@ sub ap_subtotal { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 2451cc1a4..9d3f11717 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -410,7 +410,7 @@ sub form_header { {transdate}> text('button') - . qq|> + . qq|> |; $button2 = qq| {duedate}> @@ -522,7 +522,7 @@ sub form_header { $jsscript - + {rowcount}> @@ -585,7 +585,7 @@ $jsscript - + @@ -1030,8 +1030,8 @@ sub search { } (@{ $form->{all_departments} }); } - $department = qq| - + $department = qq| + @@ -1559,4 +1559,3 @@ sub ar_subtotal { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 3d5219840..56ae60813 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -92,7 +92,7 @@ sub chart_of_accounts { print qq| - +
| . $locale->text('Notes') . qq|
| . $locale->text('Department') . qq|
@@ -513,4 +513,3 @@ sub ca_subtotal { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 314b32941..4decb86c3 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -316,7 +316,7 @@ sub form_header {
$form->{title}
- + $jsscript |; @@ -781,4 +781,3 @@ sub check_form { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 6dbf42556..e20efd2b9 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -641,7 +641,7 @@ sub form_header { - + | . $locale->text('Street') . qq| @@ -766,7 +766,7 @@ sub form_header { | . $locale->text('Bank Code Number') . qq| | . $locale->text('Bank') . qq| - + $business @@ -859,7 +859,7 @@ $update_button } print qq| - +
@@ -1171,4 +1171,3 @@ sub salesman_selected { } sub continue { &{ $form->{nextsub} } } - diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index 654a0e2f9..01c519d7b 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -61,30 +61,30 @@ sub export { | . $locale->text("Beraternummer") . qq| - + | . $locale->text("DFV-Kennzeichen") . qq| | . $locale->text("Beratername") . qq| - + | . $locale->text("Password") . qq| | . $locale->text("Mandantennummer") . qq| - + | . $locale->text("Datenträgernummer") . qq| - + | . $locale->text("Kontonummernerweiterung (KNE)") . qq| - + | . $locale->text("Abrechnungsnummer") . qq| @@ -93,7 +93,7 @@ sub export { . $locale->text("Export Buchungsdaten") . qq| - + | . $locale->text("Export Stammdaten") . qq| @@ -216,7 +216,7 @@ sub export_bewegungsdaten { - +  | . $locale->text('Quartal') . qq| @@ -224,13 +224,13 @@ sub export_bewegungsdaten { - +  | . $locale->text('Datum von') . qq| | . $locale->text('bis') . qq| - + diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index a34572fbf..e0a5811d2 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -248,7 +248,7 @@ sub search { text('button') - . qq|> + . qq|> |; $button2 = qq| @@ -1056,7 +1056,7 @@ sub form_header { {transdate} tabindex="2" $readonly> text('button') - . qq|> + . qq|> |; #write Trigger @@ -1124,7 +1124,7 @@ sub form_header { |; } - print qq| + print qq| $department|; if ($form->{id}) { print qq| @@ -1215,7 +1215,7 @@ sub form_header { . $locale->text('Split Debit') . qq|"> {debit_splited}> - + | . $locale->text('Credit') . qq| @@ -1288,7 +1288,7 @@ sub form_footer { |; } } - print qq| + print qq| {path}> {login}> {password}> @@ -1598,7 +1598,7 @@ sub display_split_credit { function update_stilltopost (betrag){ remaining = parseFloat(document.split_credit.creditpost.value) - parseFloat(betrag); document.split_credit.creditpost.value= remaining; - } + } |; @@ -1690,7 +1690,7 @@ sub display_split_debit { function update_stilltopost (betrag){ remaining = parseFloat(document.split_debit.debitpost.value) - parseFloat(betrag); document.split_debit.debitpost.value= remaining; - } + }
|; diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 33a78b94d..81db76741 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -527,7 +527,7 @@ sub choice { print qq| + . $locale->text('list') . qq|"> @@ -1262,7 +1262,7 @@ sub addtop100 { print qq| - + |; @@ -2259,7 +2259,7 @@ sub form_header { print qq| - + {script}> @@ -2325,7 +2325,7 @@ sub form_header { . $locale->text('Updated') . qq| $button1 - + @@ -2351,7 +2351,7 @@ sub form_header { $imagelinks - + $jsscript |; $lxdebug->leave_sub(); @@ -3044,4 +3044,3 @@ sub restock_assemblies { } sub continue { &{ $form->{nextsub} } } - diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index fac3ba47b..a684593e7 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -271,7 +271,7 @@ sub form_header { + . qq|> |; $button2 = qq| @@ -328,12 +328,12 @@ sub form_header { - + - + {vendor_id}> @@ -391,7 +391,7 @@ sub form_header { $jsscript - + {defaultcurrency}> {fxgain_accno}> @@ -551,7 +551,7 @@ sub form_footer { - +
| . $locale->text('List Price') . qq| {listprice}>
{invdate}> text('button') - . qq|>{duedate}>
| . $locale->text('Vendor') . qq| $vendor| . $locale->text('Contact Person') . qq| $contact
Dokumente im Webdav-Repository
@@ -560,7 +560,7 @@ sub form_footer { |; foreach $file (keys %{ $form->{WEBDAV} }) { $webdav_list .= qq| - + @@ -949,4 +949,3 @@ sub yes { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 5b9df52c9..4673ccb06 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -316,7 +316,7 @@ sub form_header { + . qq|> |; $button2 = qq| @@ -477,7 +477,7 @@ sub form_header { $jsscript - + @@ -645,7 +645,7 @@ sub form_footer { - +
$file $form->{WEBDAV}{$file}
{invdate}> text('button') - . qq|>{duedate}>
Dokumente im Webdav-Repository
@@ -654,7 +654,7 @@ sub form_footer { |; foreach $file (keys %{ $form->{WEBDAV} }) { $webdav_list .= qq| - + @@ -1101,4 +1101,3 @@ sub yes { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl index 4efab2ff3..93397361b 100644 --- a/bin/mozilla/licenses.pl +++ b/bin/mozilla/licenses.pl @@ -493,7 +493,7 @@ sub search {
$file $form->{WEBDAV}{$file}
-
+
diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index e6dd8e7a2..cea155976 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -99,7 +99,7 @@ sub login_screen { | . $locale->text('Login Name') . qq| - + | . $locale->text('Password') . qq| @@ -119,7 +119,7 @@ sub login_screen { - + |; @@ -238,4 +238,3 @@ $myconfig{company} $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index d9ccd05a8..44bfbd49d 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -242,7 +242,7 @@ sub form_header { {transdate}> text('button') - . qq|> + . qq|> |; $button2 = qq| {reqdate}> @@ -573,7 +573,7 @@ sub form_header { - + $jsscript @@ -589,7 +589,7 @@ $jsscript - + @@ -749,7 +749,7 @@ sub form_footer { if ($webdav) { $webdav_list = qq| - + Dokumente im Webdav-Repository @@ -758,7 +758,7 @@ sub form_footer { |; foreach $file (keys %{ $form->{WEBDAV} }) { $webdav_list .= qq| - + @@ -813,7 +813,7 @@ Bearbeiten des $form->{heading}
|; } - print qq| + print qq| |; @@ -850,7 +850,7 @@ Bearbeiten des $form->{heading}
&menubar; } - print qq| + print qq| {rowcount}> @@ -1088,8 +1088,8 @@ sub search { } (@{ $form->{all_departments} }); } - $department = qq| - + $department = qq| + @@ -2271,7 +2271,7 @@ sub display_ship_receive { - + @@ -2422,7 +2422,7 @@ sub display_ship_receive { } print qq| - + {rowcount}> @@ -2676,7 +2676,7 @@ sub list_transfer {
$file $form->{WEBDAV}{$file}
| . $locale->text('Department') . qq|
- +
@@ -2719,4 +2719,3 @@ sub transfer { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 0ee06213a..201e96b22 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -283,7 +283,7 @@ sub project_report { print qq| - + |; @@ -611,4 +611,3 @@ sub form_partsgroup_footer { $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 5772e1697..7989d8635 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -200,7 +200,7 @@ sub report { . $locale->text('button') . qq|>|; $button2 = qq| |; - $button2_2 = qq| + $button2_2 = qq| text('button') . qq|> |; @@ -394,7 +394,7 @@ $jsscript
- + | . $locale->text('Method') . qq| | @@ -524,7 +524,7 @@ $checked>
- + | . $locale->text('Method') . qq| | @@ -533,15 +533,15 @@ $checked> . $locale->text('EUR') . qq| - -$jsscript + +$jsscript |; } if ($form->{report} eq "ustva") { print qq| - +
@@ -638,7 +638,7 @@ $checked>
- + | . $locale->text('Method') . qq| | @@ -702,7 +702,7 @@ $checked> . $locale->text('Account Number') . qq| - + $jsscript |; } @@ -739,7 +739,7 @@ $jsscript . $locale->text('All Accounts') . qq| - + $jsscript |; } @@ -974,7 +974,7 @@ $jsscript - + $jsscript |; } @@ -1035,8 +1035,8 @@ $jsscript . qq| -$jsscript - +$jsscript + {db}> |; @@ -1906,7 +1906,7 @@ sub aging { {path}> {login}> {password}> - +
@@ -3261,4 +3261,3 @@ sub generate_ustva { } $lxdebug->leave_sub(); } - diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index e04bc458a..1bab65166 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -157,10 +157,10 @@ sub report { $form->{tel}
| . $locale->text('Fax.: ') . qq| - $form->{fax} + $form->{fax}

- $form->{email} + $form->{email}

| . $locale->text('Steuernummer: ') . qq| @@ -192,7 +192,7 @@ sub report { . qq|" name="FA_steuerberater" id=steuerberater class=checkbox type=checkbox value="1">  | . $locale->text('Steuerberater/-in') . qq| - + $form->{FA_steuerberater_name}
$form->{FA_steuerberater_street}
$form->{FA_steuerberater_city}
@@ -267,7 +267,7 @@ sub report { if ($form->{FA_Name} ne '') { print qq| - +
| . $locale->text('Finanzamt') . qq| @@ -289,7 +289,7 @@ sub report {
| . $locale->text('Tel. : ') . qq| $form->{FA_Telefon} -
+
| . $locale->text('Fax. : ') . qq| $form->{FA_Fax}
@@ -331,7 +331,7 @@ sub report { $form->{FA_Bankbezeichnung_1} -
+
| . $locale->text('Konto: ') . qq| $form->{FA_Kontonummer_1}
@@ -343,7 +343,7 @@ sub report {
| . $locale->text('Konto: ') . qq| $form->{FA_Kontonummer_2} -
+
| . $locale->text('BLZ: ') . qq| $form->{FA_BLZ_2} @@ -357,10 +357,10 @@ sub report {

$form->{FA_Bankbezeichnung_1} -
+
| . $locale->text('Konto: ') . qq| $form->{FA_Kontonummer_1} -
+
| . $locale->text('BLZ: ') . qq| $form->{FA_BLZ_1}

|; @@ -371,10 +371,10 @@ sub report {

$form->{FA_Bankbezeichnung_oertlich} -
+
| . $locale->text('Konto: ') . qq| $form->{FA_Kontonummer_2} -
+
| . $locale->text('BLZ: ') . qq| $form->{FA_BLZ_2} |; @@ -640,7 +640,7 @@ sub ustva_vorauswahl { - + |; } print qq||; @@ -726,14 +726,14 @@ sub ustva_vorauswahl { - + |; } foreach $key (sort keys %listeb) { print qq| - + |; } print qq||; @@ -1113,7 +1113,7 @@ sub edit { - +

@@ -1158,7 +1158,7 @@ sub edit { - +

@@ -1177,7 +1177,7 @@ sub edit { my @variables = qw( steuernummer elsterland elstersteuernummer elsterFFFF); my $variable = ''; foreach $variable (@variables) { - print qq| + print qq| |; } my $steuernummer_new = ''; @@ -1202,7 +1202,7 @@ sub edit { FA_Email FA_Internet); foreach $variable (@variables) { - print qq| + print qq| |; } @@ -1235,8 +1235,8 @@ sub edit_form { || $form->{elsterland_new} eq 'Auswahl'); USTVA::info( $locale->text( - 'Es fehlen Angaben zur Versteuerung. - Wenn Sie Ist Versteuert sind, wählen Sie die Einnahmen/Überschuß-Rechnung aus. + 'Es fehlen Angaben zur Versteuerung. + Wenn Sie Ist Versteuert sind, wählen Sie die Einnahmen/Überschuß-Rechnung aus. Sind Sie Soll-Versteuert und Bilanzverpflichtet, dann wählen Sie Bilanz aus.' )) if ($form->{method} eq ''); @@ -1581,7 +1581,7 @@ sub show_fa_daten { | . $locale->text('Telefon') . qq|

-
+
| . $locale->text('Fax') . qq|

@@ -1620,7 +1620,7 @@ sub show_fa_daten { | . $locale->text('Bankverbindungen des Finanzamts') . qq| - +
- +
| . $locale->text('Kreditinstitut') . qq| @@ -1632,7 +1632,7 @@ sub show_fa_daten {

-
+
| . $locale->text('Bankleitzahl') . qq|
@@ -1647,7 +1647,7 @@ sub show_fa_daten {

-
+
| . $locale->text('Bankleitzahl') . qq|
@@ -1667,7 +1667,7 @@ sub show_fa_daten {

-
+
| . $locale->text('Bankleitzahl (BLZ)') . qq|
@@ -1685,12 +1685,12 @@ sub show_fa_daten { | . $locale->text('Bankverbindung des Finanzamts') . qq| - + | . $locale->text('Kontonummer') . qq|

-
+
| . $locale->text('Bankleitzahl (BLZ)') . qq|
@@ -1704,7 +1704,7 @@ sub show_fa_daten { } print qq|
|; @@ -1801,7 +1801,7 @@ SWITCH: do { $form->error( "Ungültiger Anmeldezeitraum.\n - Sie können für ELSTER nur einen monatlichen oder + Sie können für ELSTER nur einen monatlichen oder quartalsweisen Anmeldezeitraum auswählen." ); }; @@ -2147,4 +2147,3 @@ sub elster_xml { close XML; $lxdebug->leave_sub(); } - -- 2.20.1