From: Sven Schöling Date: Fri, 11 Dec 2009 14:29:16 +0000 (+0100) Subject: Tabs aus *.pl Dateien entfernt. X-Git-Tag: release-2.6.1beta1~72^2~3 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b65a230d60e86d2c18a3ab7222379905aea5ecd7;p=kivitendo-erp.git Tabs aus *.pl Dateien entfernt. --- diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 27b18e400..3cb5ac3d8 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -727,7 +727,7 @@ sub list_department { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -929,7 +929,7 @@ sub list_lead { map { print "$column_header{$_}\n" } @column_index; print qq| - + |; my ($i, %column_data); @@ -939,17 +939,17 @@ sub list_lead { $i %= 2; print qq| - + |; -# $lead = $ref->{lead}; +# $lead = $ref->{lead}; $column_data{description} = qq|$ref->{lead}|; map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -1163,7 +1163,7 @@ sub list_business { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -1417,7 +1417,7 @@ sub list_language { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -1769,7 +1769,7 @@ sub list_buchungsgruppe { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; $row++; @@ -1853,10 +1853,10 @@ sub buchungsgruppe_header { if (!$main::eur) { $linkaccounts = qq| - | . $locale->text('Inventory') . qq| - - - |; + | . $locale->text('Inventory') . qq| + + + |; } else { $linkaccounts = qq| {inventory_accno_id}>|; @@ -1864,28 +1864,28 @@ sub buchungsgruppe_header { $linkaccounts .= qq| - - | . $locale->text('National Revenues') . qq| - - - - | . $locale->text('National Expenses') . qq| - - |; + + | . $locale->text('National Revenues') . qq| + + + + | . $locale->text('National Expenses') . qq| + + |; if ($form->{id}) { $form->{selectIC_income} =~ s/selected//g; $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/ value=$form->{income_accno_id_1} selected/; $form->{selectIC_expense} =~ s/selected//g; $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/ value=$form->{expense_accno_id_1} selected/; } - $linkaccounts .= qq| - | . $locale->text('Revenues EU with UStId') . qq| - - - - | . $locale->text('Expenses EU with UStId') . qq| - - |; + $linkaccounts .= qq| + | . $locale->text('Revenues EU with UStId') . qq| + + + + | . $locale->text('Expenses EU with UStId') . qq| + + |; if ($form->{id}) { $form->{selectIC_income} =~ s/selected//g; @@ -1894,14 +1894,14 @@ sub buchungsgruppe_header { $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/ value=$form->{expense_accno_id_2} selected/; } - $linkaccounts .= qq| - | . $locale->text('Revenues EU without UStId') . qq| - - - - | . $locale->text('Expenses EU without UStId') . qq| - - |; + $linkaccounts .= qq| + | . $locale->text('Revenues EU without UStId') . qq| + + + + | . $locale->text('Expenses EU without UStId') . qq| + + |; if ($form->{id}) { $form->{selectIC_income} =~ s/selected//g; @@ -1910,14 +1910,14 @@ sub buchungsgruppe_header { $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/ value=$form->{expense_accno_id_3} selected/; } - $linkaccounts .= qq| - | . $locale->text('Foreign Revenues') . qq| - - - - | . $locale->text('Foreign Expenses') . qq| - - + $linkaccounts .= qq| + | . $locale->text('Foreign Revenues') . qq| + + + + | . $locale->text('Foreign Expenses') . qq| + + |; @@ -2106,7 +2106,7 @@ sub list_printer { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -2393,7 +2393,7 @@ sub list_payment { map { print "$column_data{$_}\n" } @column_index; print qq| - + |; $row++; } @@ -2787,10 +2787,10 @@ sub audit_control { - - - - + + + +
| . $locale->text('Close Books up to') . qq|{closedto}>
| . $locale->text('Close Books up to') . qq|{closedto}>
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 3852dad71..bac1b8197 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -265,13 +265,13 @@ sub form_header { if ($form->{forex}) { $exchangerate .= qq| - | . $locale->text('Exchangerate') . qq| + | . $locale->text('Exchangerate') . qq| {exchangerate}>$form->{exchangerate} |; } else { $exchangerate .= qq| - | . $locale->text('Exchangerate') . qq| + | . $locale->text('Exchangerate') . qq| {exchangerate}> |; } @@ -296,11 +296,11 @@ sub form_header { my $department = qq| - | . $locale->text('Department') . qq| - - - - + | . $locale->text('Department') . qq| + + + + | if $form->{selectdepartment}; my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1"; @@ -440,64 +440,64 @@ sub form_header { - - +
- - - - - - - - - - - - - - - - - {defaultcurrency}> - {fxgain_accno}> - {fxloss_accno}> - $exchangerate - - $department - $taxincluded -
| . $locale->text('Vendor') . qq|$vendor
- - - - - - - {creditlimit}> - {creditremaining}> - -
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}| . $locale->text('Remaining') . qq|$form->{creditremaining}
-
| . $locale->text('Currency') . qq|
-
- - - - - - - - - - - + + - + +
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Invoice Date') . qq| + + + + + + + + + + + + + + + + + {defaultcurrency}> + {fxgain_accno}> + {fxloss_accno}> + $exchangerate + + $department + $taxincluded +
| . $locale->text('Vendor') . qq|$vendor
+ + + + + + + {creditlimit}> + {creditremaining}> + +
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}| . $locale->text('Remaining') . qq|$form->{creditremaining}
+
| . $locale->text('Currency') . qq|
+
+ + + + + + + + + + + $button1 - - - + + + $button2 - -
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Invoice Date') . qq|
| . $locale->text('Due Date') . qq|
| . $locale->text('Due Date') . qq|
-
+
@@ -507,20 +507,15 @@ sub form_header { $jsscript {rowcount}> - - - - - - - - - + +
| - . $locale->text('Account') . qq|| - . $locale->text('Amount') . qq|| - . $locale->text('Tax') . qq|| - . $locale->text('Taxkey') . qq|| - . $locale->text('Project') . qq|
+ + + + + + + + |; my $amount = $locale->text('Amount'); @@ -578,13 +573,13 @@ $jsscript '-default' => $form->{"project_id_$i"} )); print qq| - + $tax - + |; $amount = ""; $project = ""; @@ -610,37 +605,37 @@ $jsscript - - + + - {oldinvtotal}> - {oldtotalpaid}> + {oldinvtotal}> + {oldtotalpaid}> - + - + -
| . $locale->text('Account') . qq|| . $locale->text('Amount') . qq|| . $locale->text('Tax') . qq|| . $locale->text('Taxkey') . qq|| . $locale->text('Project') . qq|
$selectAP_amount {"amount_$i"}> $form->{"tax_$i"}$projectnumber
${APselected}$form->{invtotal}${APselected}$form->{invtotal}
-
+ - - - + + +
| . $locale->text('Notes') . qq|$notes
| . $locale->text('Notes') . qq|$notes
- - - + + + |; my @column_index; @@ -1105,8 +1100,8 @@ sub post_as_new { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "POSTED AS NEW"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "POSTED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &post; @@ -1188,7 +1183,7 @@ sub yes { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; + $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index ce22ab08d..a740728ac 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -91,8 +91,8 @@ sub add { # saving the history if(!exists $form->{addition} && ($form->{id} ne "")) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "ADDED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "ADDED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -293,8 +293,8 @@ sub form_header { if ($form->{currency} ne $form->{defaultcurrency}) { if ($form->{forex}) { $exchangerate .= qq| - - + + |; } else { $exchangerate .= qq| @@ -305,10 +305,10 @@ sub form_header { } $taxincluded = qq| - - - - + + + + |; if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) { @@ -318,12 +318,12 @@ sub form_header { qq||; $department = qq| - - - - + + + + | if $form->{selectdepartment}; my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1"; @@ -338,11 +338,11 @@ sub form_header { if ($form->{selectemployee}) { $employee = qq| - - - - - + + + + + |; } @@ -478,66 +478,66 @@ sub form_header {
| . $locale->text('Payments') . qq|
| . $locale->text('Payments') . qq|
| . $locale->text('Exchangerate') . qq|{exchangerate}>$form->{exchangerate}| . $locale->text('Exchangerate') . qq|{exchangerate}>$form->{exchangerate}
{taxincluded}>| . $locale->text('Tax Included') . qq|
{taxincluded}>| . $locale->text('Tax Included') . qq|
| . $locale->text('Department') . qq| - -
| . $locale->text('Department') . qq| + +
| . $locale->text('Salesperson') . qq|
| . $locale->text('Salesperson') . qq|
- - @@ -547,10 +547,10 @@ $jsscript
- - - - - - - - {terms}> - - - - - - - - - - {defaultcurrency}> - {fxgain_accno}> - {fxloss_accno}> - $exchangerate - - $department - $taxincluded -
| . $locale->text('Customer') . qq|$customer
- - - - - - - {creditlimit}> - {creditremaining}> - -
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}| . $locale->text('Remaining') . qq|$form->{creditremaining}
-
| . $locale->text('Currency') . qq|
-
- - $employee - - - - - - - - - - + + - + +
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Invoice Date') . qq| + + + + + + + + {terms}> + + + + + + + + + + {defaultcurrency}> + {fxgain_accno}> + {fxloss_accno}> + $exchangerate + + $department + $taxincluded +
| . $locale->text('Customer') . qq|$customer
+ + + + + + + {creditlimit}> + {creditremaining}> + +
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}| . $locale->text('Remaining') . qq|$form->{creditremaining}
+
| . $locale->text('Currency') . qq|
+
+ + $employee + + + + + + + + + + $button1 - - - + + + $button2 - +
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Invoice Date') . qq|
| . $locale->text('Due Date') . qq|
| . $locale->text('Due Date') . qq|
-
- - + - @@ -558,7 +558,7 @@ $jsscript . $locale->text('Taxkey') . qq| - + |; $amount = $locale->text('Amount'); @@ -622,13 +622,13 @@ $jsscript '-default' => $form->{"project_id_$i"} )); print qq| - + $tax - + |; $amount = ""; $project = ""; @@ -650,15 +650,15 @@ $jsscript - - + + - {oldinvtotal}> - {oldtotalpaid}> + {oldinvtotal}> + {oldtotalpaid}> - + - + @@ -669,19 +669,19 @@ $jsscript
| +
| . $locale->text('Account') . qq|| + | . $locale->text('Amount') . qq| | . $locale->text('Tax') . qq| | . $locale->text('Project') . qq|
$selectAR_amount {"amount_$i"}> $form->{"tax_$i"}$projectnumber
${ARselected}$form->{invtotal}${ARselected}$form->{invtotal}
- - - + + +
| . $locale->text('Notes') . qq|$notes
| . $locale->text('Notes') . qq|$notes
- - + - + |; if ($form->{currency} eq $form->{defaultcurrency}) { @@ -1159,8 +1159,8 @@ sub post_as_new { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "POSTED AS NEW"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "POSTED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &post; @@ -1242,8 +1242,8 @@ sub yes { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Transaction deleted!')); diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 7612166a5..0278aa5f7 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -173,12 +173,12 @@ sub select_name {
| +
| . $locale->text('Incoming Payments') . qq|
- |; + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + |; my $i = 0; @@ -197,12 +197,12 @@ sub select_name { $j++; $j %= 2; print qq| - |; + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + {id}> @@ -371,7 +371,7 @@ sub select_project { + + |; } else { print qq| - - - - - |; + + + + + |; } print qq| @@ -1247,13 +1247,13 @@ sub form_header { - - - |; + + + + |; } } @@ -470,14 +470,14 @@ sub form_footer { $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); $TMPL_VAR{tax} .= qq| - - - - - - - - |; + + + + + + + + |; } } } @@ -552,7 +552,7 @@ sub update { my $rows = scalar @{ $form->{item_list} }; # hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen - # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009 + # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009 # select discount as vendor_discount from vendor || # select discount as customer_discount from customer $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100); @@ -1059,8 +1059,8 @@ sub save_and_close { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -1166,8 +1166,8 @@ sub save { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -1254,8 +1254,8 @@ sub delete_order_quotation { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->info($msg); @@ -1460,16 +1460,16 @@ sub backorder_exchangerate { diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 4d06f5270..e003e07d2 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -101,10 +101,10 @@ sub search { $form->{title} = $locale->text('Groups'); $number = qq| - - - - + + + + |; } @@ -116,10 +116,10 @@ sub search { $form->{title} = $locale->text('Pricegroup'); $number = qq| - - - - + + + + |; } @@ -143,13 +143,11 @@ sub search { @@ -196,8 +194,8 @@ sub save { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -224,8 +222,8 @@ sub delete { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $main::lxdebug->leave_sub(); @@ -283,7 +281,7 @@ sub partsgroup_report {
- |; + |; map { print "\n$column_data{$_}" } @column_index; diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl index 421667da8..1445eba05 100644 --- a/bin/mozilla/bp.pl +++ b/bin/mozilla/bp.pl @@ -123,29 +123,29 @@ sub search { receipt => { title => 'Receipts', name => 'Customer' }); $label{invoice}{invnumber} = qq| - - - - + + + + |; $label{invoice}{ordnumber} = qq| - - - - + + + + |; $label{sales_quotation}{quonumber} = qq| - - - - + + + + |; $label{check}{chknumber} = qq| - - - - + + + + |; $label{packing_list}{invnumber} = $label{invoice}{invnumber}; @@ -164,12 +164,12 @@ sub search { if (BP->payment_accounts(\%myconfig, \%$form)) { $account = qq| - + |; if ($form->{accounts}) { $account .= qq| - + |; } $account .= qq| - + |; } @@ -243,23 +243,23 @@ sub search { @@ -535,13 +535,13 @@ sub list_spool { @@ -1085,11 +1085,11 @@ sub form_header { my $department; $department = qq| - - - - - + + + + + | if $form->{selectdepartment}; if ($init) { $form->{fokus} = "gl.reference"; @@ -1161,71 +1161,71 @@ sub form_header { . " $form->{previous_gldate}" . qq| - - - - + |; if ($form->{id}) { print qq| - - - - - |; + + + + + |; } print qq| - $department|; + $department|; if ($form->{id}) { print qq| - - - + + + - - |; +
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Quotation Number') . qq|
| . $locale->text('Quotation Number') . qq|
| . $locale->text('Reference') . qq|
| . $locale->text('Reference') . qq|
| . $locale->text('Account') . qq|| . $locale->text('Account') . qq|
- - - - - $account - $label{$form->{type}}{invnumber} - $label{$form->{type}}{ordnumber} - $label{$form->{type}}{quonumber} - $label{$form->{type}}{chknumber} - $label{$form->{type}}{rctnumber} - - + + + + + $account + $label{$form->{type}}{invnumber} + $label{$form->{type}}{ordnumber} + $label{$form->{type}}{quonumber} + $label{$form->{type}}{chknumber} + $label{$form->{type}}{rctnumber} + + $button1 - + $button2 - - + +
Kunde$name
| . $locale->text('From') . qq|
Kunde$name
| . $locale->text('From') . qq|| . $locale->text('Bis') . qq|| . $locale->text('Bis') . qq|
- + |; map { print "\n$column_header{$_}" } @column_index; print qq| - + |; # add sort and escape callback, this one we use for the add sub diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index b35b66495..e4185ab33 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -172,9 +172,9 @@ sub list { my $department = qq| - - - + + + | if $form->{selectdepartment}; my $accrual = ($main::eur) ? "" : "checked"; my $cash = ($main::eur) ? "checked" : ""; @@ -263,107 +263,86 @@ sub list {
| . $locale->text('Department') . qq|
| . $locale->text('Department') . qq|
- - + - - - - - + |; our $checked; print qq| - - + - - - - - + + + - + |; $checked = "checked"; print qq| - + |; $checked = ""; print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index 2b2016f76..17dac992e 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -92,7 +92,7 @@ sub select_part { "nextsub" => "select_part_internal", "callback_sub" => $callback_sub, "has_charge" => $has_charge, - "has_ean" => $has_ean, + "has_ean" => $has_ean, "remap_parts_id" => $remap_parts_id, "remap_partnumber" => $remap_partnumber }); @@ -477,27 +477,27 @@ sub reformat_numbers { # ------------------------------------------------------------------------- sub show_history { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $dbh = $form->dbconnect(\%myconfig); - my ($sort, $sortby) = split(/\-\-/, $form->{order}); + my $dbh = $form->dbconnect(\%myconfig); + my ($sort, $sortby) = split(/\-\-/, $form->{order}); $sort =~ s/.*\.(.*)/$1/; - $form->{title} = $locale->text("History"); - $form->header(); - print $form->parse_html_template( "common/show_history", { - "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}), - "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), - uc($sort) => 1, - uc($sort)."BY" => $sortby - } ); - - $dbh->disconnect(); - $main::lxdebug->leave_sub(); + $form->{title} = $locale->text("History"); + $form->header(); + print $form->parse_html_template( "common/show_history", { + "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}), + "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), + uc($sort) => 1, + uc($sort)."BY" => $sortby + } ); + + $dbh->disconnect(); + $main::lxdebug->leave_sub(); } # ------------------------------------------------------------------------- @@ -531,7 +531,7 @@ sub call_sub { # ------------------------------------------------------------------------- sub show_vc_details { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); my $form = $main::form; my %myconfig = %main::myconfig; @@ -550,7 +550,7 @@ sub show_vc_details { $form->header(); print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" }); - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } # ------------------------------------------------------------------------- diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index c19cc5312..94f82e694 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -145,17 +145,17 @@ sub form_header { $form->format_amount(\%myconfig, $form->{exchangerate}); if ($form->{forex}) { $exchangerate = qq| - - - - + + + + |; } else { $exchangerate = qq| - - - - + + + + |; } } @@ -340,9 +340,9 @@ sub list_invoices {
| +
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|text('YYYY') . qq|" value="$year">
+
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
  | . $locale->text('Quarterly') . qq| + | . $locale->text('Monthly') . qq|
   1. | - . $locale->text('Quarter') . qq| 1. | . $locale->text('Quarter') . qq| | - . $locale->text('January') . qq| | . $locale->text('January') . qq| | - . $locale->text('May') . qq| | - . $locale->text('September') . qq|
  2. | - . $locale->text('Quarter') . qq| | - . $locale->text('February') . qq| | - . $locale->text('June') . qq| | - . $locale->text('October') . qq|
  3. | - . $locale->text('Quarter') . qq| | - . $locale->text('March') . qq| | - . $locale->text('July') . qq| | - . $locale->text('November') . qq|
  4. | - . $locale->text('Quarter') . qq|  | - . $locale->text('April') . qq| | - . $locale->text('August') . qq| | - . $locale->text('December') . qq|

| - . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  - $button1 +  | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

| . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  + $button1 $button1_2  - | . $locale->text('Bis') . qq|  - $button2 + | . $locale->text('Bis') . qq|  + $button2 $button2_2

| . $locale->text('Method') . qq|| - . $locale->text('Accrual') . qq| -  | - . $locale->text('EUR') . qq|
| - . $locale->text('Decimalplaces') - . qq|
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
| . $locale->text('Decimalplaces') . qq|
| . $locale->text('Exchangerate') . qq|{exchangerate}>$form->{exchangerate}
| . $locale->text('Exchangerate') . qq|{exchangerate}>$form->{exchangerate}
| . $locale->text('Exchangerate') . qq|{exchangerate}>
| . $locale->text('Exchangerate') . qq|{exchangerate}>
- - - + + + |; $column_data{invnumber} = @@ -405,7 +405,7 @@ sub list_invoices { $j++; $j %= 2; print qq| - + |; map { print "$column_data{$_}\n" } @column_index; print qq| @@ -466,7 +466,7 @@ sub form_footer { $format .= qq| @@ -214,17 +214,17 @@ sub export_bewegungsdaten { @@ -302,11 +302,11 @@ sub export_stammdaten { - - - + + + + | if $form->{selectdepartment}; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -321,83 +321,83 @@ sub search { +
$invoice
$invoice
- - - - - - - - - - - - - - - - - - - - - - - | . # OBE-Export noch nicht implementiert! + + + + + + + + + + + + + + + + + + + + + + + | . # OBE-Export noch nicht implementiert! qq| - - - + + + - - +
| . $locale->text("Beraternummer") . qq|| . $locale->text("DFV-Kennzeichen") . qq|
| . $locale->text("Beratername") . qq|| . $locale->text("Password") . qq|
| . $locale->text("Mandantennummer") . qq|| . $locale->text("Medium Number") . qq|
| . $locale->text("Kontonummernerweiterung (KNE)") . qq|
| . $locale->text("Beraternummer") . qq|| . $locale->text("DFV-Kennzeichen") . qq|
| . $locale->text("Beratername") . qq|| . $locale->text("Password") . qq|
| . $locale->text("Mandantennummer") . qq|| . $locale->text("Medium Number") . qq|
| . $locale->text("Kontonummernerweiterung (KNE)") . qq| | . $locale->text("Abrechnungsnummer") . qq|
| . $locale->text("Abrechnungsnummer") . qq|
| . $locale->text("Export Buchungsdaten") . qq| | + | . $locale->text("Export Stammdaten") . qq|
- + - + - + @@ -233,10 +233,10 @@ sub export_bewegungsdaten { . $locale->text('Datum von') . qq| - + - +
 | . $locale->text('Monat') . qq|
 | . $locale->text('Quartal') . qq|
| . $locale->text('bis') . qq|| . $locale->text('bis') . qq|
- + - +
| . $locale->text('Von Konto: ') . qq|| . $locale->text('Von Konto: ') . qq|
| . $locale->text('Bis Konto: ') . qq|| . $locale->text('Bis Konto: ') . qq|
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index a72ab89ea..cf85bf515 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -176,9 +176,9 @@ sub save { DN->save_config(\%myconfig, \%$form); # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; $form->{addition} = "SAVED FOR DUNNING"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Dunning Process Config saved!')); @@ -245,9 +245,9 @@ sub save_dunning { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; $form->{addition} = "DUNNING STARTED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index fd8482b19..8ba48d691 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -624,8 +624,8 @@ sub save { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|donumber_| . $form->{donumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -670,8 +670,8 @@ sub delete_delivery_order { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|donumber_| . $form->{donumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -799,7 +799,7 @@ sub invoice_multi { # zwischenspeichern (DO.pm) und als ' '-separierte Liste wieder zurueckschreiben # Hinweis: delete gibt den wert zurueck und loescht danach das element (nett und einfach) # $shell: perldoc perlunc; /delete EXPR - $form->{donumber} = delete $form->{donumber_array}; + $form->{donumber} = delete $form->{donumber_array}; $form->{deliverydate} = $form->{transdate}; $form->{transdate} = $form->current_date(\%myconfig); $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1); @@ -829,9 +829,9 @@ sub invoice_multi { $ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref }; map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost); - $form->{"discount_$form->{rowcount}"} = $form->{"discount_$form->{rowcount}"} * 100; #s.a. Bug 1151 - # Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen - # Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09 + $form->{"discount_$form->{rowcount}"} = $form->{"discount_$form->{rowcount}"} * 100; #s.a. Bug 1151 + # Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen + # Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09 } delete $form->{form_details}; diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 4b34a5080..f5f846037 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -250,10 +250,10 @@ sub search { } my $department = qq| -
| . $locale->text('Department') . qq|
| . $locale->text('Department') . qq|
- - - - - - - $department - - - - - - - - - - - - - - + + + + + + + $department + + + + + + + + + + + + + + $button1 - + $button2 - - - - + + + +
| . $locale->text('Reference') . qq|| . $locale->text('Source') . qq|
| . $locale->text('Description') . qq|
| . $locale->text('Notes') . qq|
| . $locale->text('Project Number') . qq|$projectnumber
| . $locale->text('From') . qq|
| . $locale->text('Reference') . qq|| . $locale->text('Source') . qq|
| . $locale->text('Description') . qq|
| . $locale->text('Notes') . qq|
| . $locale->text('Project Number') . qq|$projectnumber
| . $locale->text('From') . qq|| . $locale->text('To (time)') . qq|| . $locale->text('To (time)') . qq|
| . $locale->text('Include in Report') . qq| - - - + + + -
-  | +
| . $locale->text('Include in Report') . qq| + + + - - -
+  | . $locale->text('All') . qq| -  | +  | . $locale->text('Asset') . qq| -  | +  | . $locale->text('Liability') . qq| -  | +  | . $locale->text('Revenue') . qq| -  | +  | . $locale->text('Expense') . qq| -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| . $locale->text('ID') . qq|| . $locale->text('Date') . qq|| . $locale->text('Reference') . qq|| . $locale->text('Description') . qq|| . $locale->text('Notes') . qq|
| . $locale->text('Debit') . qq|| . $locale->text('Credit') . qq|| . $locale->text('Source') . qq|| . $locale->text('Account') . qq|
| . $locale->text('Subtotal') . qq|| . $locale->text('Project Number') . qq|
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
| . $locale->text('ID') . qq|| . $locale->text('Date') . qq|| . $locale->text('Reference') . qq|| . $locale->text('Description') . qq|| . $locale->text('Notes') . qq|
| . $locale->text('Debit') . qq|| . $locale->text('Credit') . qq|| . $locale->text('Source') . qq|| . $locale->text('Account') . qq|
| . $locale->text('Subtotal') . qq|| . $locale->text('Project Number') . qq|
+
+
| . $locale->text('Department') . qq|
| . $locale->text('Department') . qq|
| . $locale->text('Reference') . qq| - - - + + + + - |; + +
| . $locale->text('Date') . qq|
| . $locale->text('Reference') . qq| + + + $button1 - -
| . $locale->text('Date') . qq|
-
+
| . $locale->text('Belegnummer') . qq| - - - - - -
| . $locale->text('Buchungsdatum') . qq|{gldate} $readonly onBlur=\"check_right_date_format(this)\">
-
| . $locale->text('Belegnummer') . qq| + + + + + +
| . $locale->text('Buchungsdatum') . qq|{gldate} $readonly onBlur=\"check_right_date_format(this)\">
+
| . $locale->text('Description') . qq|$description
| . $locale->text('Description') . qq|$description - - - - - -
| . $locale->text('MwSt. inkl.') . qq|
-
- - - - - -
| . $locale->text('Mitarbeiter') . qq|
-
+ + + + +
| . $locale->text('MwSt. inkl.') . qq|
+
+ + + + + +
| . $locale->text('Mitarbeiter') . qq|
+
| . $locale->text('Description') . qq|$description - - - - - -
| . $locale->text('MwSt. inkl.') . qq|
-
| . $locale->text('Description') . qq|$description + + + + + +
| . $locale->text('MwSt. inkl.') . qq|
+
- - + - - + - @@ -1262,14 +1262,14 @@ sub form_header { if ($form->{show_details}) { print qq| - - - + + + |; } print qq| - + $jsscript |; @@ -1422,8 +1422,8 @@ sub yes { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Transaction deleted!')) diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 9b5b20a25..add189593 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -290,14 +290,14 @@ sub update_prices { # # # -# -# -# -# -# -# -# -# |; +# +# +# +# +# +# +# +# |; # # my $j = 0; # my $i = $form->{rows}; @@ -308,20 +308,20 @@ sub update_prices { # |; # if ($j == 1) { # print qq| -# |; +# |; # } else { # print qq| -# |; +# |; # } # print qq| -# -# -# -# -# +# +# +# +# +# # # -# |; +# |; # } # # print qq| @@ -1781,8 +1781,8 @@ sub save { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $parts_id = $form->{id}; @@ -1914,8 +1914,8 @@ sub save_as_new { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "SAVED AS NEW"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->{id} = 0; @@ -1935,8 +1935,8 @@ sub delete { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history my $rc = IC->delete(\%myconfig, \%$form); diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 5ac873e73..07db7eac6 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -750,7 +750,7 @@ sub check_form { #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; # fuer assemblies auskommentiert. siehe oben - # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); + # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1)); $count++; } @@ -1421,10 +1421,10 @@ sub print_form { call_sub($display_form); # saving the history - if(!exists $form->{addition}) { + if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "PRINTED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "PRINTED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history exit; @@ -1641,16 +1641,16 @@ sub print_form { if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; if($form->{media} =~ /printer/) { - $form->{addition} = "PRINTED"; + $form->{addition} = "PRINTED"; } elsif($form->{media} =~ /email/) { - $form->{addition} = "MAILED"; + $form->{addition} = "MAILED"; } elsif($form->{media} =~ /queue/) { - $form->{addition} = "QUEUED"; + $form->{addition} = "QUEUED"; } elsif($form->{media} =~ /screen/) { - $form->{addition} = "SCREENED"; + $form->{addition} = "SCREENED"; } $form->save_history($form->dbconnect(\%myconfig)); } @@ -1809,72 +1809,72 @@ sub ship_to { diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 0e64a5b8a..c44ef42f3 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -475,9 +475,8 @@ sub update { # override sellprice if there is one entered my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - # ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb - $form->{"discount_$i"} = $form->format_amount(\%myconfig, - $form->{vendor_discount} * 100 ); + # ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{vendor_discount} * 100 ); map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; @@ -614,14 +613,14 @@ sub post_payment { ($form->{AP}) = split /--/, $form->{AP}; ($form->{AP_paid}) = split /--/, $form->{AP_paid}; if (IR->post_payment(\%myconfig, \%$form)){ - if (!exists $form->{addition} && $form->{id} ne "") { - # saving the history + if (!exists $form->{addition} && $form->{id} ne "") { + # saving the history $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "PAYMENT POSTED"; + $form->{addition} = "PAYMENT POSTED"; $form->{what_done} = $form->{currency} . qq| | . $form->{paid} . qq| | . $locale->text("POSTED"); - $form->save_history($form->dbconnect(\%myconfig)); - # /saving the history - } + $form->save_history($form->dbconnect(\%myconfig)); + # /saving the history + } $form->redirect($locale->text('Payment posted!')); } @@ -707,16 +706,16 @@ sub post { relink_accounts(); if (IR->post_invoice(\%myconfig, \%$form)){ - # saving the history - if(!exists $form->{addition} && $form->{id} ne "") { + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "POSTED"; - #$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber}; - $form->save_history($form->dbconnect(\%myconfig)); - } - # /saving the history + #$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber}; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history remove_draft() if $form->{remove_draft}; - $form->redirect( $locale->text('Invoice') + $form->redirect( $locale->text('Invoice') . " $form->{invnumber} " . $locale->text('posted!')); } @@ -777,8 +776,8 @@ sub yes { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Invoice deleted!')); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 0b53602f6..4b9b1a5eb 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -907,10 +907,10 @@ sub yes { if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) { # saving the history - if(!exists $form->{addition}) { + if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text('Invoice deleted!')); diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl index b5a895a44..3e01a31a0 100644 --- a/bin/mozilla/kopf.pl +++ b/bin/mozilla/kopf.pl @@ -65,37 +65,37 @@ if (seconds < 10) {seconds="0"+seconds} var thistime = hours+":"+minutes function writeclock() { - i_clock++ - if (document.all \|\| document.getElementById \|\| document.layers) { - clockid[i_clock]="clock"+i_clock - document.write(""+thistime+"") - } + i_clock++ + if (document.all \|\| document.getElementById \|\| document.layers) { + clockid[i_clock]="clock"+i_clock + document.write(""+thistime+"") + } } function clockon() { - thistime= new Date() - hours=thistime.getHours() - minutes=thistime.getMinutes() - seconds=thistime.getSeconds() - if (eval(hours) <10) {hours="0"+hours} - if (eval(minutes) < 10) {minutes="0"+minutes} - if (seconds < 10) {seconds="0"+seconds} - //thistime = hours+":"+minutes+":"+seconds - thistime = hours+":"+minutes + thistime= new Date() + hours=thistime.getHours() + minutes=thistime.getMinutes() + seconds=thistime.getSeconds() + if (eval(hours) <10) {hours="0"+hours} + if (eval(minutes) < 10) {minutes="0"+minutes} + if (seconds < 10) {seconds="0"+seconds} + //thistime = hours+":"+minutes+":"+seconds + thistime = hours+":"+minutes - if (document.all) { - for (i=0;i<=clockid.length-1;i++) { - var thisclock=eval(clockid[i]) - thisclock.innerHTML=thistime - } - } + if (document.all) { + for (i=0;i<=clockid.length-1;i++) { + var thisclock=eval(clockid[i]) + thisclock.innerHTML=thistime + } + } - if (document.getElementById) { - for (i=0;i<=clockid.length-1;i++) { - document.getElementById(clockid[i]).innerHTML=thistime - } - } - var timer=setTimeout("clockon()",60000) + if (document.getElementById) { + for (i=0;i<=clockid.length-1;i++) { + document.getElementById(clockid[i]).innerHTML=thistime + } + } + var timer=setTimeout("clockon()",60000) } window.onload=clockon //--> @@ -107,12 +107,12 @@ print qq|
| +
| . $locale->text('Account') . qq|| . $locale->text('Chart balance') . qq|| + | . $locale->text('Chart balance') . qq|| . $locale->text('Debit') . qq|| + | . $locale->text('Credit') . qq| | . $locale->text('Tax') . qq|| . $locale->text('Source') . qq|| . $locale->text('Memo') . qq|| . $locale->text('Project Number') . qq|| . $locale->text('Source') . qq|| . $locale->text('Memo') . qq|| . $locale->text('Project Number') . qq|
| . $locale->text('choice part') . qq|
 | . $locale->text('Part Number') . qq|| . $locale->text('Part Description') . qq|| . $locale->text('Unit of measure') . qq|| . $locale->text('Sell Price') . qq|| . $locale->text('soldtotal') . qq|
 | . $locale->text('Part Number') . qq|| . $locale->text('Part Description') . qq|| . $locale->text('Unit of measure') . qq|| . $locale->text('Sell Price') . qq|| . $locale->text('soldtotal') . qq|
$form->{"partnumber_$j"}$form->{"description_$j"}$form->{"unit_$j"}$form->{"sellprice_$j"}$form->{"soldtotal_$j"}$form->{"partnumber_$j"}$form->{"description_$j"}$form->{"unit_$j"}$form->{"sellprice_$j"}$form->{"soldtotal_$j"}
- - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
| +
| . $locale->text('Billing Address') . qq|| + | . $locale->text('Shipping Address') . qq|
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
- - - + + - + +
  [| . $locale->text('drucken') . qq|]| +
  [| . $locale->text('drucken') . qq|]| . $login . $datum . qq|   -
diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl index f4455d606..ef7b2b817 100644 --- a/bin/mozilla/menujs.pl +++ b/bin/mozilla/menujs.pl @@ -181,152 +181,152 @@ var isNS4 = (document.layers ? true : false); //var KO = (navigator.appName=="Konqueror" \|\| navigator.appName=="Opera") ; var KO = ((navigator.userAgent.indexOf('Opera',0) != -1) \|\| (navigator.userAgent.indexOf('Konqueror',0) != -1)); function getRef(id) { - if (isDOM) return document.getElementById(id); - if (isIE4) return document.all[id]; - if (isNS4) return document.layers[id]; + if (isDOM) return document.getElementById(id); + if (isIE4) return document.all[id]; + if (isNS4) return document.layers[id]; } function getSty(id) { - return (isNS4 ? getRef(id) : getRef(id).style); + return (isNS4 ? getRef(id) : getRef(id).style); } var popTimer = 0; var litNow = new Array(); function popOver(menuNum, itemNum) { - if (KO) document.getElementById("win1").style.visibility = "hidden"; - clearTimeout(popTimer); - hideAllBut(menuNum); - litNow = getTree(menuNum, itemNum); - changeCol(litNow, true); - targetNum = menu[menuNum][itemNum].target; - if (targetNum > 0) { - thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left); - thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top); - with (menu[targetNum][0].ref) { - left = parseInt(thisX + menu[targetNum][0].x); - top = parseInt(thisY + menu[targetNum][0].y); - visibility = 'visible'; - } - } + if (KO) document.getElementById("win1").style.visibility = "hidden"; + clearTimeout(popTimer); + hideAllBut(menuNum); + litNow = getTree(menuNum, itemNum); + changeCol(litNow, true); + targetNum = menu[menuNum][itemNum].target; + if (targetNum > 0) { + thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left); + thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top); + with (menu[targetNum][0].ref) { + left = parseInt(thisX + menu[targetNum][0].x); + top = parseInt(thisY + menu[targetNum][0].y); + visibility = 'visible'; + } + } } function popOut(menuNum, itemNum) { - if ((menuNum == 0) && !menu[menuNum][itemNum].target) - hideAllBut(0) - if (KO) document.getElementById("win1").style.visibility = "visible"; - else - popTimer = setTimeout('hideAllBut(0)', 500); + if ((menuNum == 0) && !menu[menuNum][itemNum].target) + hideAllBut(0) + if (KO) document.getElementById("win1").style.visibility = "visible"; + else + popTimer = setTimeout('hideAllBut(0)', 500); } function getTree(menuNum, itemNum) { - itemArray = new Array(menu.length); - while(1) { - itemArray[menuNum] = itemNum; - if (menuNum == 0) return itemArray; - itemNum = menu[menuNum][0].parentItem; - menuNum = menu[menuNum][0].parentMenu; - } + itemArray = new Array(menu.length); + while(1) { + itemArray[menuNum] = itemNum; + if (menuNum == 0) return itemArray; + itemNum = menu[menuNum][0].parentItem; + menuNum = menu[menuNum][0].parentMenu; + } } function changeCol(changeArray, isOver) { - for (menuCount = 0; menuCount < changeArray.length; menuCount++) { - if (changeArray[menuCount]) { - newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol; - with (menu[menuCount][changeArray[menuCount]].ref) { - if (isNS4) bgColor = newCol; - else backgroundColor = newCol; - } - } - } + for (menuCount = 0; menuCount < changeArray.length; menuCount++) { + if (changeArray[menuCount]) { + newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol; + with (menu[menuCount][changeArray[menuCount]].ref) { + if (isNS4) bgColor = newCol; + else backgroundColor = newCol; + } + } + } } function hideAllBut(menuNum) { - var keepMenus = getTree(menuNum, 1); - for (count = 0; count < menu.length; count++) - if (!keepMenus[count]) - menu[count][0].ref.visibility = 'hidden'; - changeCol(litNow, false); + var keepMenus = getTree(menuNum, 1); + for (count = 0; count < menu.length; count++) + if (!keepMenus[count]) + menu[count][0].ref.visibility = 'hidden'; + changeCol(litNow, false); } function Menu(isVert, popInd, x, y, width, overCol, backCol, borderClass, textClass) { - this.isVert = isVert; - this.popInd = popInd - this.x = x; - this.y = y; - this.width = width; - this.overCol = overCol; - this.backCol = backCol; - this.borderClass = borderClass; - this.textClass = textClass; - this.parentMenu = null; - this.parentItem = null; - this.ref = null; + this.isVert = isVert; + this.popInd = popInd + this.x = x; + this.y = y; + this.width = width; + this.overCol = overCol; + this.backCol = backCol; + this.borderClass = borderClass; + this.textClass = textClass; + this.parentMenu = null; + this.parentItem = null; + this.ref = null; } function Item(text, href, frame, length, spacing, target) { - this.text = text; - this.href = href; - this.frame = frame; - this.length = length; - this.spacing = spacing; - this.target = target; - this.ref = null; + this.text = text; + this.href = href; + this.frame = frame; + this.length = length; + this.spacing = spacing; + this.target = target; + this.ref = null; } function go(link,frame) { - tmp=eval("top."+frame); - tmp.location=link; + tmp=eval("top."+frame); + tmp.location=link; //top.main_window.location=link; } function writeMenus() { - if (!isDOM && !isIE4 && !isNS4) return; - for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) { - var str = '', itemX = 0, itemY = 0; - for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) { - var itemID = 'menu' + currMenu + 'item' + currItem; - var w = (isVert ? width : length); - var h = (isVert ? length : width); - if (isDOM \|\| isIE4) { - str += '
'; - str += ''; - str +=''; - if (target > 0) { - menu[target][0].parentMenu = currMenu; - menu[target][0].parentItem = currItem; - if (popInd) str += ''; - } - str += '
' + text + '' + popInd + '
' + (isNS4 ? '' : '
'); - if (isVert) itemY += length + spacing; - else itemX += length + spacing; - } - if (isDOM) { - var newDiv = document.createElement('div'); - document.getElementsByTagName('body').item(0).appendChild(newDiv); - newDiv.innerHTML = str; - ref = newDiv.style; - ref.position = 'absolute'; - ref.visibility = 'hidden'; - } - if (isIE4) { - document.body.insertAdjacentHTML('beforeEnd', ''); - ref = getSty('menu' + currMenu + 'div'); - } - if (isNS4) { - ref = new Layer(0); - ref.document.write(str); - ref.document.close(); - } - for (currItem = 1; currItem < menu[currMenu].length; currItem++) { - itemName = 'menu' + currMenu + 'item' + currItem; - if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName); - if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName]; - } - } - with(menu[0][0]) { - ref.left = x; - ref.top = y; - ref.visibility = 'visible'; + if (!isDOM && !isIE4 && !isNS4) return; + for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) { + var str = '', itemX = 0, itemY = 0; + for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) { + var itemID = 'menu' + currMenu + 'item' + currItem; + var w = (isVert ? width : length); + var h = (isVert ? length : width); + if (isDOM \|\| isIE4) { + str += '
'; + str += ''; + str +=''; + if (target > 0) { + menu[target][0].parentMenu = currMenu; + menu[target][0].parentItem = currItem; + if (popInd) str += ''; + } + str += '
' + text + '' + popInd + '
' + (isNS4 ? '' : '
'); + if (isVert) itemY += length + spacing; + else itemX += length + spacing; + } + if (isDOM) { + var newDiv = document.createElement('div'); + document.getElementsByTagName('body').item(0).appendChild(newDiv); + newDiv.innerHTML = str; + ref = newDiv.style; + ref.position = 'absolute'; + ref.visibility = 'hidden'; + } + if (isIE4) { + document.body.insertAdjacentHTML('beforeEnd', ''); + ref = getSty('menu' + currMenu + 'div'); + } + if (isNS4) { + ref = new Layer(0); + ref.document.write(str); + ref.document.close(); + } + for (currItem = 1; currItem < menu[currMenu].length; currItem++) { + itemName = 'menu' + currMenu + 'item' + currItem; + if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName); + if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName]; + } + } + with(menu[0][0]) { + ref.left = x; + ref.top = y; + ref.visibility = 'visible'; } } var menu = new Array(); @@ -346,12 +346,12 @@ nsResizeHandler = new Function('if (popOldWidth != window.innerWidth) location.r if (isNS4) document.captureEvents(Event.CLICK); document.onclick = clickHandle; function clickHandle(evt) { - if (isNS4) document.routeEvent(evt); - hideAllBut(0); - if (KO) document.getElementById("win1").style.visibility = "visible"; + if (isNS4) document.routeEvent(evt); + hideAllBut(0); + if (KO) document.getElementById("win1").style.visibility = "visible"; } function moveRoot() { - with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5); + with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5); } // End --> @@ -399,11 +399,11 @@ sub section_menu { # Untermen if ($mlz{"s$ml"} > 1) { - $z++; - $sm = 1; + $z++; + $sm = 1; } else { - $z = $sm; - $mlz{"s$ml"}++; + $z = $sm; + $mlz{"s$ml"}++; } print qq|menu[$mlz{$ml}][$z] = new Item('$label', '#', '', defLength, 0, | @@ -435,7 +435,7 @@ sub section_menu { $sm = 1; my $breit = 15 + length($label) * 6; print - qq|menu[0][$mm] = new Item(' $label', '#', '', $breit, 10, $pm); \n|; + qq|menu[0][$mm] = new Item(' $label', '#', '', $breit, 10, $pm); \n|; print qq|menu[$pm] = new Array();\n|; print qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|; diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index f05bcfb85..9cc570ace 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -452,10 +452,10 @@ sub form_footer { $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); $TMPL_VAR{tax} .= qq| -
$form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|%$form->{"${item}_total"}
$form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|%$form->{"${item}_total"}
Enthaltene $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|%$form->{"${item}_total"}
Nettobetrag$form->{"${item}_netto"}
Enthaltene $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|%$form->{"${item}_total"}
Nettobetrag$form->{"${item}_netto"}
- - - - - - - + + + + + + + - - + +
| . $locale->text('Currency') . qq|$form->{currency}
| . $locale->text('Date') . qq|$orddate
| . $locale->text('Currency') . qq|$form->{currency}
| . $locale->text('Date') . qq|$orddate
| . $locale->text('Exchangerate') . qq|| . $locale->text('Exchangerate') . qq|
| . $locale->text('Group') . qq|
| . $locale->text('Group') . qq|
| . $locale->text('Pricegroup') . qq|
| . $locale->text('Pricegroup') . qq|
$number - - - - + + + +
 | - . $locale->text('All') . qq| -  | - . $locale->text('Orphaned') . qq|
 | . $locale->text('All') . qq| +  | . $locale->text('Orphaned') . qq|
- + |; map { print "$column_header{$_}\n" } @column_index; @@ -378,11 +376,10 @@ sub form_partsgroup_header { @@ -419,11 +416,11 @@ sub form_partsgroup_footer { # button for saving history print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; # /button for saving history print qq| @@ -491,7 +488,7 @@ sub pricegroup_report { @@ -673,20 +673,20 @@ $jsscript
- - - + + - +
| . $locale->text('Group') . qq|
| . $locale->text('Group') . qq|
- + |; map { print "$column_header{$_}\n" } @column_index; @@ -589,10 +586,10 @@ sub form_pricegroup_header { @@ -631,11 +628,11 @@ sub form_pricegroup_footer { # button for saving history print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; # /button for saving history print qq| diff --git a/bin/mozilla/projects.pl b/bin/mozilla/projects.pl index d340ddb7f..0e74d53e2 100644 --- a/bin/mozilla/projects.pl +++ b/bin/mozilla/projects.pl @@ -234,8 +234,8 @@ sub save { if(!exists $form->{addition} && $project->{id} ne "") { $form->{id} = $project->{id}; $form->{snumbers} = qq|projectnumber_| . $project->{projectnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -277,8 +277,8 @@ sub delete { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|projectnumber_| . $project->{projectnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl index df360adee..0f01ac98a 100644 --- a/bin/mozilla/rc.pl +++ b/bin/mozilla/rc.pl @@ -76,19 +76,19 @@ sub reconciliation { @@ -203,7 +203,7 @@ sub display_form { @@ -351,34 +350,34 @@ sub display_form { diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 5099c8995..5164b7f10 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -14,8 +14,8 @@ # # Contributors: Antonio Gallardo # Benjamin Lee -# Philip Reetz -# Udo Spallek +# Philip Reetz +# Udo Spallek # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -160,10 +160,10 @@ sub report { } my $department = qq| - - - - + + + + | if $form->{selectdepartment}; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -279,30 +279,30 @@ sub report { if ($form->{report} eq "projects") { print qq| - - - + + + - + - + - +
- - + + - +
| . $locale->text('Preisgruppe') . qq|
| . $locale->text('Preisgruppe') . qq|
- - - - - - - - - - + + + + + + + + + +
| . $locale->text('Account') . qq| -
| . $locale->text('From') . qq| - | . $locale->text('Until') . qq| -
| . $locale->text('Account') . qq| +
| . $locale->text('From') . qq| + | . $locale->text('Until') . qq| +
- + |; map { print "\n$column_header{$_}" } @column_index; @@ -227,13 +227,13 @@ sub display_form { . $form->format_amount(\%myconfig, $balance, 2, 0) . ""; my $j = 0; print qq| - + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + |; my $cleared; @@ -292,13 +292,13 @@ sub display_form { $j++; $j %= 2; print qq| - + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + |; } @@ -314,7 +314,7 @@ sub display_form { . $form->format_amount(\%myconfig, $totalcredits, 2, " ") . ""; print qq| - + |; map { print "\n$column_data{$_}" } @column_index; @@ -335,15 +335,14 @@ sub display_form { if ($fx) { $fx = $form->format_amount(\%myconfig, $fx, 2, 0); $exchdiff = qq| - - - + + + |; } print qq| - +
| - . $locale->text('Exchangerate Difference') . qq|$fx| . $locale->text('Exchangerate Difference') . qq|$fx
- - - + + +
- - - - - - - - $exchdiff - -
| . $locale->text('Cleared Balance') . qq|$clearedbalance
-
- - - - - - - - - - - - -
| . $locale->text('Statement Balance') . qq|{statementbalance}>
| . $locale->text('Difference') . qq|
-
+ + + + + + + + $exchdiff + +
| . $locale->text('Cleared Balance') . qq|$clearedbalance
+
+ + + + + + + + + + + + +
| . $locale->text('Statement Balance') . qq|{statementbalance}>
| . $locale->text('Difference') . qq|
+
| . $locale->text('Department') . qq|
| . $locale->text('Department') . qq|
| . $locale->text('Project') . qq| -
| . $locale->text('Project') . qq| +
| . $locale->text('From') . qq|| . $locale->text('From') . qq| $button1 $button1_2| . $locale->text('Bis') . qq|| . $locale->text('Bis') . qq| $button2 $button2_2
- - - - + + + + $jsscript |; @@ -310,86 +310,86 @@ $jsscript if ($form->{report} eq "income_statement") { print qq| - - - - + + + +
| . $locale->text('Include in Report') . qq| | . $locale->text('Heading') . qq| -  | . $locale->text('Subtotal') . qq|
| . $locale->text('Include in Report') . qq| | . $locale->text('Heading') . qq| +  | . $locale->text('Subtotal') . qq|
| . $locale->text('Project') . qq|$projectnumber
| . $locale->text('Project') . qq|$projectnumber
- - - - - - - + + + + + + + |; print qq| - - - - - - - - + + + + + + + + |; $checked = ""; print qq| - + |; $checked = ""; print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + $jsscript |; @@ -397,87 +397,87 @@ $jsscript if ($form->{report} eq "bwa") { print qq| - - - - + + + +
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq|
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq| | . $locale->text('January') . qq| | . $locale->text('January') . qq| | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

 | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

| . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  - $button1 + | . $locale->text('From') . qq|  + $button1 $button1_2  - | . $locale->text('Bis') . qq| + | . $locale->text('Bis') . qq| $button2 $button2_2 

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | . $locale->text('EUR') . qq|

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
| . $locale->text('Project') . qq|$projectnumber
| . $locale->text('Project') . qq|$projectnumber
- - - - - - - + + + + + + + |; print qq| - - - - - - - + + + + + - + |; $checked = "checked"; print qq| - + |; $checked = ""; print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + @@ -490,40 +490,40 @@ $jsscript if ($form->{report} eq "balance_sheet") { print qq| - - - + + - - + - - - - - + + + + +
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
  + | . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq| 1. | . $locale->text('Quarter') . qq| | . $locale->text('January') . qq| | . $locale->text('January') . qq| | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

 | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

| . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  - $button1 + | . $locale->text('From') . qq|  + $button1 $button1_2  - | . $locale->text('Bis') . qq|  - $button2 + | . $locale->text('Bis') . qq|  + $button2 $button2_2

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | . $locale->text('EUR') . qq|

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
| . $locale->text('Decimalplaces') . qq|
| . $locale->text('as at') . qq| +
| . $locale->text('as at') . qq| $button1 $button1_2 | . $locale->text('Compare to') . qq| + | . $locale->text('Compare to') . qq| $button2 $button2_2
| . $locale->text('Decimalplaces') . qq|
| . $locale->text('Decimalplaces') . qq|
- - - - - - - - - + + + + + + + + + $jsscript |; @@ -531,86 +531,86 @@ $jsscript if ($form->{report} eq "trial_balance") { print qq| - - - - + + + +
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| | . $locale->text('Heading') . qq| -  | . $locale->text('Subtotal') . qq| -  | . $locale->text('Account Number') . qq|
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| | . $locale->text('Heading') . qq| +  | . $locale->text('Subtotal') . qq| +  | . $locale->text('Account Number') . qq|
| . $locale->text('Project') . qq|$projectnumber
| . $locale->text('Project') . qq|$projectnumber
- - - - - - - + + + + + + + |; print qq| - - - - - - - - + + + + + + + + |; $checked = "checked"; print qq| - + |; $checked = ""; print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + @@ -631,15 +631,15 @@ $jsscript print qq| - - - - - - - - - + + + + + + + + - - - - - + + + + + +
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq|
| . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq| | . $locale->text('January') . qq| | . $locale->text('January') . qq| | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

 | . $locale->text('May') . qq| | . $locale->text('September') . qq|
  2. | . $locale->text('Quarter') . qq| | . $locale->text('February') . qq| | . $locale->text('June') . qq| | . $locale->text('October') . qq|
  3. | . $locale->text('Quarter') . qq| | . $locale->text('March') . qq| | . $locale->text('July') . qq| | . $locale->text('November') . qq|
  4. | . $locale->text('Quarter') . qq|  | . $locale->text('April') . qq| | . $locale->text('August') . qq| | . $locale->text('December') . qq|

| . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  - $button1 + | . $locale->text('From') . qq|  + $button1 $button1_2  - | . $locale->text('Bis') . qq|  - $button2 + | . $locale->text('Bis') . qq|  + $button2 $button2_2

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | . $locale->text('EUR') . qq|

| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
| . $locale->text('All Accounts') . qq|
| . $locale->text('From') . qq|{fromdate}>| . $locale->text('Bis') . qq|
| . $locale->text('Report for') . qq| +
| . $locale->text('From') . qq|{fromdate}>| . $locale->text('Bis') . qq|
| . $locale->text('Report for') . qq| |; $checked = "checked"; @@ -659,13 +659,13 @@ $jsscript {db}> -
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | . $locale->text('EUR') . qq|
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| +  | . $locale->text('EUR') . qq|
- - + |; } @@ -724,34 +724,34 @@ $jsscript {report}> - - - - - - - - - + + + + + + + + - - - - + |; } @@ -802,25 +802,25 @@ $jsscript : qq|{vc} size=35>|; print qq| - - - - - - + + + + + - + - + - - + + $jsscript |; @@ -845,44 +845,44 @@ $jsscript print qq| - + - + + + - + - + - + - + - + - - - - + + + - - + - + - - + + $jsscript - {db}> - + {db}> + |; } @@ -1819,7 +1819,7 @@ sub e_mail { if ($myconfig{role} eq 'admin') { $bcc = qq| - + |; } @@ -1843,16 +1843,16 @@ sub e_mail { @@ -1860,11 +1860,11 @@ sub e_mail { @@ -2070,9 +2070,9 @@ sub print_form { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "PRINTED"; - $form->{what_done} = $form->{type}; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "PRINTED"; + $form->{what_done} = $form->{type}; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $main::lxdebug->leave_sub(); @@ -2223,13 +2223,13 @@ sub generate_tax_report {
| . $locale->text('Include in Report') . qq| - - - - - - - - - - - - + - + + + + + + + + + + +
| . $locale->text('ID') . qq|| . $locale->text('Invoice') . qq|| . $locale->text('Date') . qq|
|; + | . $locale->text('Include in Report') . qq| + + + + + + + + + + + + - - - - - - - - - - -
| . $locale->text('ID') . qq|| . $locale->text('Invoice') . qq|| . $locale->text('Date') . qq|
|; if ($form->{db} eq 'ar') { print $locale->text('Customer'); @@ -697,19 +697,19 @@ $jsscript print qq| | . $locale->text('Amount') . qq|| . $locale->text('Tax') . qq|| . $locale->text('Total') . qq|
| . $locale->text('Subtotal') . qq|
-
| . $locale->text('Amount') . qq|| . $locale->text('Tax') . qq|| . $locale->text('Total') . qq|
| . $locale->text('Subtotal') . qq|
+
| . $locale->text('From') . qq|{fromdate}>| . $locale->text('Bis') . qq|
| . $locale->text('Method') . qq|| +
| . $locale->text('From') . qq|{fromdate}>| . $locale->text('Bis') . qq|
| . $locale->text('Method') . qq|| . $locale->text('Accrual') . qq| -  | +  | . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| - - - - - - - - - - - - + + + - + + + + + + + + +
| . $locale->text('ID') . qq|| . $locale->text('Invoice') . qq|| . $locale->text('Date') . qq|
|; +
| . $locale->text('Include in Report') . qq| + + + + + + + + + + + + - - - - - - - - -
| . $locale->text('ID') . qq|| . $locale->text('Invoice') . qq|| . $locale->text('Date') . qq|
|; if ($form->{db} eq 'ar') { print $locale->text('Customer'); @@ -762,17 +762,17 @@ $jsscript print qq| | . $locale->text('Amount') . qq|| . $locale->text('Total') . qq|
| . $locale->text('Subtotal') . qq|
-
| . $locale->text('Amount') . qq|| . $locale->text('Total') . qq|
| . $locale->text('Subtotal') . qq|
+
| . $locale->text($label) . qq|$vc
| . $locale->text('From') . qq|  - $button1 +
| . $locale->text($label) . qq|$vc
| . $locale->text('From') . qq|  + $button1 $button1_2  - | . $locale->text('Bis') . qq|  - $button2 + | . $locale->text('Bis') . qq|  + $button2 $button2_2
| . $locale->text('Account') . qq|| . $locale->text('Account') . qq| - -
| . $locale->text('Reference') . qq|| . $locale->text('Reference') . qq|
| . $locale->text('Source') . qq|| . $locale->text('Source') . qq|
| . $locale->text('Memo') . qq|| . $locale->text('Memo') . qq|
| . $locale->text('From') . qq| +
| . $locale->text('From') . qq| $button1 $button1_2 | . $locale->text('Bis') . qq| + | . $locale->text('Bis') . qq| $button2 $button2_2
| . $locale->text('Include Exchangerate Difference') . qq| -
| . $locale->text('Include Exchangerate Difference') . qq| +
| . $locale->text('Bcc') . qq| - - - - - - - - - $bcc - + + + + + + + + + $bcc +
| . $locale->text('E-mail') . qq|| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
| . $locale->text('E-mail') . qq|| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
- - - - - + + + + +
| . $locale->text('Message') . qq|
| . $locale->text('Message') . qq|
- + |; map { print "$column_header{$_}\n" } @column_index; print qq| - + |; # add sort and escape callback @@ -2276,13 +2276,13 @@ sub generate_tax_report { $i++; $i %= 2; print qq| - + |; map { print "$column_data{$_}\n" } @column_index; print qq| - + |; } @@ -2295,7 +2295,7 @@ sub generate_tax_report { print qq| - + |; my $total = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, " "); @@ -2346,7 +2346,7 @@ sub tax_subtotal { $subtotaltax = 0; print qq| - + |; map { print "\n$column_data{$_}" } @column_index; @@ -2516,21 +2516,18 @@ sub print_options { my ($media); my $type = qq| - {cp_id}\"> \n";
$row->{cp_givenname} $row->{cp_name} $row->{cp_title} $row->{cp_greeting}