X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=5cdeaa5100f3596c1264a0b2a72c3b6d631f562f;hb=ebef09a8bde1d401fc7b0d60cfe09393e9a84c0f;hp=0106afdaaaebe15eababc796b86c48a04ff97075;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 0106afdaa..5cdeaa510 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -32,15 +32,17 @@ #====================================================================== # # module for preparing Income Statement and Balance Sheet -# +# #====================================================================== require "$form->{path}/arap.pl"; +require "bin/mozilla/common.pl"; use SL::PE; use SL::RP; 1; + # end of main # this is for our long dates @@ -87,145 +89,158 @@ use SL::RP; sub report { $lxdebug->enter_sub(); - %title = ( 'balance_sheet' => 'Balance Sheet', - 'income_statement' => 'Income Statement', - 'trial_balance' => 'Trial Balance', - 'ar_aging' => 'AR Aging', - 'ap_aging' => 'Offene Verbindlichkeiten', - 'tax_collected' => 'Tax collected', - 'tax_paid' => 'Tax paid', - 'nontaxable_sales' => 'Non-taxable Sales', - 'nontaxable_purchases' => 'Non-taxable Purchases', - 'receipts' => 'Receipts', - 'payments' => 'Payments', - 'projects' => 'Project Transactions', - 'bwa' => 'Betriebswirtschaftliche Auswertung', - 'ustva' => 'Umsatzsteuervoranmeldung', - ); - - $form->{title} = $locale->text($title{$form->{report}}); - - $accrual = ($eur) ? "" : "checked"; - $cash = ($eur) ? "checked" : ""; - - ($null,$null,$null,$null,$null,$year,$null,$null,$null) = localtime(); + %title = ('balance_sheet' => 'Balance Sheet', + 'income_statement' => 'Income Statement', + 'trial_balance' => 'Trial Balance', + 'ar_aging' => 'AR Aging', + 'ap_aging' => 'Offene Verbindlichkeiten', + 'tax_collected' => 'Tax collected', + 'tax_paid' => 'Tax paid', + 'nontaxable_sales' => 'Non-taxable Sales', + 'nontaxable_purchases' => 'Non-taxable Purchases', + 'receipts' => 'Receipts', + 'payments' => 'Payments', + 'projects' => 'Project Transactions', + 'bwa' => 'Betriebswirtschaftliche Auswertung', + 'ustva' => 'Umsatzsteuervoranmeldung',); + + $form->{title} = $locale->text($title{ $form->{report} }); + + $accrual = ($eur) ? "" : "checked"; + $cash = ($eur) ? "checked" : ""; + + ($null, $null, $null, $null, $null, $year, $null, $null, $null) = + localtime(); $year += 1900; - + # get departments $form->all_departments(\%myconfig); if (@{ $form->{all_departments} }) { $form->{selectdepartment} = "\n"; - map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} }); + map { + $form->{selectdepartment} .= + "$_->{description}--$_->{id}\n" + } (@{ $form->{all_departments} }); } - + $department = qq| - |.$locale->text('Department').qq| + | . $locale->text('Department') . qq| $form->{selectdepartment} | if $form->{selectdepartment}; + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }); + + my %project_labels = (); + my @project_values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@project_values, $item->{"id"}); + $project_labels{$item->{"id"}} = $item->{"projectnumber"}; + } + + my $projectnumber = + NTI($cgi->popup_menu('-name' => "project_id", + '-values' => \@project_values, + '-labels' => \%project_labels)); + # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; - $jsscript = ""; + $jsscript = ""; if ($form->{report} eq "ustva") { - $department = ""; - } - else - { - if ($form->{report} eq "balance_sheet") - { - $name_1 = "compareasofdate"; - $id_1 = "compareasofdate"; - $value_1 = ""; - $trigger_1 = "trigger1"; - $name_2 = "asofdate"; - $id_2 = "asofdate"; - $value_2 = "$form->{asofdate}"; - $trigger_2 = "trigger2"; - } - elsif ($form->{report} =~ /(receipts|payments)$/) - { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } - else - { - if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) - { - $name_1 = ""; - $id_1 = ""; - $value_1 = ""; - $trigger_1 = ""; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; + $department = ""; + } else { + if ($form->{report} eq "balance_sheet") { + $name_1 = "asofdate"; + $id_1 = "asofdate"; + $value_1 = "$form->{asofdate}"; + $trigger_1 = "trigger1"; + $name_2 = "compareasofdate"; + $id_2 = "compareasofdate"; + $value_2 = "$form->{compareasofdate}"; + $trigger_2 = "trigger2"; + } elsif ($form->{report} =~ /(receipts|payments)$/) { + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; $trigger_2 = "trigger2"; - - } - else - { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } - } - } - + } else { + if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { + $name_1 = ""; + $id_1 = ""; + $value_1 = ""; + $trigger_1 = ""; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + + } else { + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + } + } + } + # with JavaScript Calendar - if ($form->{jsscript}) - { + if ($form->{jsscript}) { if ($name_1 eq "") { - + $button1 = qq| |; $button1_2 = qq| - text('button').qq|>|; + text('button') . qq|>|; + #write Trigger - $jsscript = Form->write_trigger(\%myconfig,"1","$name_2","BR","$trigger_2","","",""); - } - else - { + $jsscript = + Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); + } else { $button1 = qq| |; $button1_2 = qq| - text('button').qq|>|; - $button2 = qq| + text('button') . qq|>|; + $button2 = qq| |; - $button2_2 = qq| - text('button').qq|> + $button2_2 = qq| + text('button') . qq|> |; + #write Trigger - $jsscript = Form->write_trigger(\%myconfig,"2","$name_1","BR","$trigger_1","$name_2","BL","$trigger_2"); - } - } - else - { - # without JavaScript Calendar - if ($name_1 eq "") { - $button1 = qq||; - } - else - { - $button1 = qq||; - $button2 = qq||; - } + $jsscript = + Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", + "$name_2", "BL", "$trigger_2"); } - + } else { + + # without JavaScript Calendar + if ($name_1 eq "") { + $button1 = + qq||; + } else { + $button1 = + qq||; + $button2 = + qq||; + } + } + $form->header; - + print qq| @@ -247,15 +262,15 @@ sub report { if ($form->{report} eq "projects") { print 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 @@ -266,9 +281,11 @@ sub report { - |.$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| $jsscript @@ -278,283 +295,348 @@ $jsscript if ($form->{report} eq "income_statement") { print qq| - |.$locale->text('Project').qq| - + | . $locale->text('Project') . qq| + $projectnumber - |.$locale->text('Customized Report').qq| + | + . $locale->text('Customized Report') . qq| - |.$locale->text('Year').qq| - + | . $locale->text('Year') . qq| + |; - -print qq| + print 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| |; -$checked = ""; -print qq| - |.$locale->text('January').qq| + $checked = ""; + print qq| + | + . $locale->text('January') . qq| |; -$checked = ""; -print qq| - |.$locale->text('May').qq| - |.$locale->text('September').qq| + $checked = ""; + print 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| + 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| + 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| + 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| + | + . $locale->text('Free report period') . qq| + | . $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| $jsscript |; -} + } if ($form->{report} eq "bwa") { print qq| - |.$locale->text('Project').qq| - + | . $locale->text('Project') . qq| + $projectnumber - |.$locale->text('Customized Report').qq| + | + . $locale->text('Customized Report') . qq| - |.$locale->text('Year').qq| - + | . $locale->text('Year') . qq| + |; - -print qq| + print 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| |; -$checked = "checked"; -print qq| - |.$locale->text('January').qq| + $checked = "checked"; + print qq| + | + . $locale->text('January') . qq| |; -$checked = ""; -print qq| - |.$locale->text('May').qq| - |.$locale->text('September').qq| + $checked = ""; + print 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| + 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| + 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| + 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| + | + . $locale->text('Free report period') . qq| + | . $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| - -$jsscript + + | + . $locale->text('Decimalplaces') + . qq| + + + +$jsscript |; -} + } if ($form->{report} eq "ustva") { - + print qq| - + - |.$locale->text('Zeitraum').qq| + | + . $locale->text('Zeitraum') . qq| - |.$locale->text('Year').qq| - + | . $locale->text('Year') . qq| + |; - -print qq| + print 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| |; -$checked = "checked"; -print qq| - |.$locale->text('January').qq| + $checked = "checked"; + print qq| + | + . $locale->text('January') . qq| |; -$checked = ""; -print qq| - |.$locale->text('May').qq| - |.$locale->text('September').qq| + $checked = ""; + print 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| + 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| + 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| + 4. | + . $locale->text('Quarter') . qq| + | + . $locale->text('April') . qq| + | + . $locale->text('August') . qq| + | + . $locale->text('December') . qq| - + - |.$locale->text('Method').qq| - |.$locale->text('Accrual').qq| - |.$locale->text('EUR').qq| + | . $locale->text('Method') . qq| + | + . $locale->text('Accrual') . qq| + | + . $locale->text('EUR') . qq| |; ########## - &print_options(); - print qq| + &print_options(); + print qq| |; -} - + } + if ($form->{report} eq "balance_sheet") { print 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| + @@ -563,34 +645,38 @@ print qq| - |.$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('Include in Report').qq| - |.$locale->text('Heading').qq| - |.$locale->text('Subtotal').qq| - |.$locale->text('Account Number').qq| + | . $locale->text('Include in Report') . qq| + | + . $locale->text('Heading') . qq| + | + . $locale->text('Subtotal') . qq| + | + . $locale->text('Account Number') . qq| - + $jsscript |; } - if ($form->{report} eq "trial_balance") { print qq| - |.$locale->text('From').qq| + | . $locale->text('From') . qq| $button1 $button1_2 - |.$locale->text('Bis').qq| + | . $locale->text('Bis') . qq| $button2 $button2_2 @@ -603,50 +689,53 @@ $jsscript - |.$locale->text('Include in Report').qq| - |.$locale->text('Heading').qq| - |.$locale->text('Subtotal').qq| - |.$locale->text('All Accounts').qq| + | . $locale->text('Include in Report') . qq| + | + . $locale->text('Heading') . qq| + | + . $locale->text('Subtotal') . qq| + | + . $locale->text('All Accounts') . qq| - + $jsscript |; } - if ($form->{report} =~ /^tax_/) { $gifi = ""; $form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap"; - + RP->get_taxaccounts(\%myconfig, \%$form); print qq| - |.$locale->text('From').qq| + | . $locale->text('From') . qq| {fromdate}> - |.$locale->text('Bis').qq| + | . $locale->text('Bis') . qq| - |.$locale->text('Report for').qq| + | . $locale->text('Report for') . qq| |; - $checked = "checked"; - foreach $ref (@{ $form->{taxaccounts} }) { - - print qq|{accno} $checked> $ref->{description} + $checked = "checked"; + foreach $ref (@{ $form->{taxaccounts} }) { + + print + qq|{accno} $checked> $ref->{description} |; - $checked = ""; + $checked = ""; - } + } - print qq| + print qq| {db}> @@ -654,35 +743,36 @@ $jsscript |; - - if (@{ $form->{gifi_taxaccounts} }) { - print qq| + if (@{ $form->{gifi_taxaccounts} }) { + print qq| - |.$locale->text('GIFI').qq| + | . $locale->text('GIFI') . qq| |; - foreach $ref (@{ $form->{gifi_taxaccounts} }) { - - print qq| $ref->{description} + foreach $ref (@{ $form->{gifi_taxaccounts} }) { + + print + qq| $ref->{description} |; - } + } - print qq| + print qq| |; - } - + } -print qq| + print qq| - |.$locale->text('Method').qq| - |.$locale->text('Accrual').qq| - |.$locale->text('EUR').qq| + | . $locale->text('Method') . qq| + | + . $locale->text('Accrual') . qq| + | + . $locale->text('EUR') . qq| @@ -691,39 +781,39 @@ print qq| - |.$locale->text('Include in Report').qq| + | . $locale->text('Include in Report') . qq| - |.$locale->text('ID').qq| + | . $locale->text('ID') . qq| - |.$locale->text('Invoice').qq| + | . $locale->text('Invoice') . qq| - |.$locale->text('Date').qq| + | . $locale->text('Date') . qq| |; - - if ($form->{db} eq 'ar') { - print $locale->text('Customer'); - } - if ($form->{db} eq 'ap') { - print $locale->text('Vendor'); - } - - print qq| + + if ($form->{db} eq 'ar') { + print $locale->text('Customer'); + } + if ($form->{db} eq 'ap') { + print $locale->text('Vendor'); + } + + print qq| - |.$locale->text('Amount').qq| + | . $locale->text('Amount') . qq| - |.$locale->text('Tax').qq| + | . $locale->text('Tax') . qq| - |.$locale->text('Total').qq| + | . $locale->text('Total') . qq| - |.$locale->text('Subtotal').qq| + | . $locale->text('Subtotal') . qq| @@ -732,12 +822,11 @@ print qq| } - if ($form->{report} =~ /^nontaxable_/) { $gifi = ""; $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap"; - + print qq| @@ -746,48 +835,50 @@ print qq| {report}> - |.$locale->text('From').qq| + | . $locale->text('From') . qq| {fromdate}> - |.$locale->text('Bis').qq| + | . $locale->text('Bis') . qq| - |.$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('Include in Report').qq| + | . $locale->text('Include in Report') . qq| - |.$locale->text('ID').qq| + | . $locale->text('ID') . qq| - |.$locale->text('Invoice').qq| + | . $locale->text('Invoice') . qq| - |.$locale->text('Date').qq| + | . $locale->text('Date') . qq| |; - - if ($form->{db} eq 'ar') { - print $locale->text('Customer'); - } - if ($form->{db} eq 'ap') { - print $locale->text('Vendor'); - } - - print qq| + + if ($form->{db} eq 'ar') { + print $locale->text('Customer'); + } + if ($form->{db} eq 'ap') { + print $locale->text('Vendor'); + } + + print qq| - |.$locale->text('Amount').qq| + | . $locale->text('Amount') . qq| - |.$locale->text('Total').qq| + | . $locale->text('Total') . qq| - |.$locale->text('Subtotal').qq| + | . $locale->text('Subtotal') . qq| @@ -796,8 +887,6 @@ print qq| } - - if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { $gifi = ""; @@ -808,23 +897,28 @@ print qq| $label = $locale->text('Vendor'); $form->{vc} = 'vendor'; } - + $nextsub = "generate_$form->{report}"; - + # setup vc selection - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); + $form->all_vc(\%myconfig, $form->{vc}, + ($form->{vc} eq 'customer') ? "AR" : "AP"); + + map { $vc .= "$_->{name}--$_->{id}\n" } + @{ $form->{"all_$form->{vc}"} }; + + $vc = + ($vc) + ? qq|{vc}>\n$vc| + : qq|{vc} size=35>|; - map { $vc .= "$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} }; - - $vc = ($vc) ? qq|{vc}>\n$vc| : qq|{vc} size=35>|; - print qq| - |.$locale->text($label).qq| + | . $locale->text($label) . qq| $vc - |.$locale->text('Bis').qq| + | . $locale->text('Bis') . qq| $button1 $button1_2 @@ -836,13 +930,12 @@ print qq| - + $jsscript |; } -# above action can be removed if there is more than one input field - + # above action can be removed if there is more than one input field if ($form->{report} =~ /(receipts|payments)$/) { $gifi = ""; @@ -854,38 +947,38 @@ $jsscript $selection = "\n"; foreach $ref (@{ $form->{PR} }) { $paymentaccounts .= "$ref->{accno} "; - $selection .= "$ref->{accno}--$ref->{description}\n"; + $selection .= "$ref->{accno}--$ref->{description}\n"; } - + chop $paymentaccounts; print qq| - |.$locale->text('Account').qq| + | . $locale->text('Account') . qq| $selection - |.$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 @@ -893,11 +986,12 @@ $jsscript - |.$locale->text('Include Exchangerate Difference').qq| + | + . $locale->text('Include Exchangerate Difference') . qq| -$jsscript - +$jsscript + {db}> |; @@ -919,27 +1013,30 @@ $jsscript {login}> {password}> - + |; - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum + # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum # Einlesen der Finanzamtdaten get_config($userspath, 'finanzamt.ini'); - - $disabled= qq|disabled="disabled"|; - $disabled='' if ($form->{elster} eq '1' ); - if ( $form->{report} eq 'ustva'){ - print qq| - + + $disabled = qq|disabled="disabled"|; + $disabled = '' if ($form->{elster} eq '1'); + if ($form->{report} eq 'ustva') { + print qq| + + value="| . $locale->text('winston_export') . qq|"> |; - print qq| - + print qq| + |; - } + } -print qq| + print qq| @@ -949,22 +1046,20 @@ print qq| $lxdebug->leave_sub(); } - -sub continue { &{$form->{nextsub}} }; - +sub continue { &{ $form->{nextsub} } } sub get_project { $lxdebug->enter_sub(); my $nextsub = shift; - + $form->{project_id} = $form->{project_id_1}; if ($form->{projectnumber} && !$form->{project_id}) { $form->{rowcount} = 1; # call this instead of update - $form->{update} = $nextsub; + $form->{update} = $nextsub; $form->{projectnumber_1} = $form->{projectnumber}; - + delete $form->{sort}; &check_project; @@ -975,202 +1070,212 @@ sub get_project { $lxdebug->leave_sub(); } - sub generate_income_statement { $lxdebug->enter_sub(); $form->{padding} = " "; - $form->{bold} = ""; + $form->{bold} = ""; $form->{endbold} = ""; - $form->{br} = ""; - - &get_project(generate_income_statement); + $form->{br} = ""; + + if ($form->{reporttype} eq "custom") { - $form->{projectnumber} = $form->{projectnumber_1}; - - if ($form->{reporttype} eq "custom"){ - #forgotten the year --> thisyear - if ($form->{year} !~ m/^\d\d\d\d$/ ) { - $locale->date(\%myconfig, $form->current_date(\%myconfig), 0)=~ /(\d\d\d\d)/; - $form->{year}= $1; + if ($form->{year} !~ m/^\d\d\d\d$/) { + $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~ + /(\d\d\d\d)/; + $form->{year} = $1; } + #yearly report - if ($form->{duetyp} eq "13" ){ - $form->{fromdate}="1.1.$form->{year}"; - $form->{todate}="31.12.$form->{year}"; + if ($form->{duetyp} eq "13") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; } - #Quater reports - if ($form->{duetyp} eq "A" ){ - $form->{fromdate}="1.1.$form->{year}"; - $form->{todate}="31.3.$form->{year}"; + + #Quater reports + if ($form->{duetyp} eq "A") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; } - if ($form->{duetyp} eq "B" ){ - $form->{fromdate}="1.4.$form->{year}"; - $form->{todate}="30.6.$form->{year}"; + if ($form->{duetyp} eq "B") { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; } - if ($form->{duetyp} eq "C" ){ - $form->{fromdate}="1.7.$form->{year}"; - $form->{todate}="30.9.$form->{year}"; + if ($form->{duetyp} eq "C") { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; } - if ($form->{duetyp} eq "D" ){ - $form->{fromdate}="1.10.$form->{year}"; - $form->{todate}="31.12.$form->{year}"; + if ($form->{duetyp} eq "D") { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; } - + #Monthly reports - SWITCH: { - $form->{duetyp} eq "1" && do { - $form->{fromdate}="1.1.$form->{year}"; - $form->{todate}="31.1.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "2" && do { - $form->{fromdate}="1.2.$form->{year}"; - #this works from 1901 to 2099, 1900 and 2100 fail. - $leap=($form->{year} % 4 == 0) ? "29" : "28"; - $form->{todate}="$leap.2.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "3" && do { - $form->{fromdate}="1.3.$form->{year}"; - $form->{todate}="31.3.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "4" && do { - $form->{fromdate}="1.4.$form->{year}"; - $form->{todate}="30.4.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "5" && do { - $form->{fromdate}="1.5.$form->{year}"; - $form->{todate}="31.5.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "6" && do { - $form->{fromdate}="1.6.$form->{year}"; - $form->{todate}="30.6.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "7" && do { - $form->{fromdate}="1.7.$form->{year}"; - $form->{todate}="31.7.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "8" && do { - $form->{fromdate}="1.8.$form->{year}"; - $form->{todate}="31.8.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "9" && do { - $form->{fromdate}="1.9.$form->{year}"; - $form->{todate}="30.9.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "10" && do { - $form->{fromdate}="1.10.$form->{year}"; - $form->{todate}="31.10.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "11" && do { - $form->{fromdate}="1.11.$form->{year}"; - $form->{todate}="30.11.$form->{year}"; - last SWITCH; - }; - $form->{duetyp} eq "12" && do { - $form->{fromdate}="1.12.$form->{year}"; - $form->{todate}="31.12.$form->{year}"; - last SWITCH; - }; - } - } - + SWITCH: { + $form->{duetyp} eq "1" && do { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.1.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "2" && do { + $form->{fromdate} = "1.2.$form->{year}"; + + #this works from 1901 to 2099, 1900 and 2100 fail. + $leap = ($form->{year} % 4 == 0) ? "29" : "28"; + $form->{todate} = "$leap.2.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "3" && do { + $form->{fromdate} = "1.3.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "4" && do { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.4.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "5" && do { + $form->{fromdate} = "1.5.$form->{year}"; + $form->{todate} = "31.5.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "6" && do { + $form->{fromdate} = "1.6.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "7" && do { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "31.7.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "8" && do { + $form->{fromdate} = "1.8.$form->{year}"; + $form->{todate} = "31.8.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "9" && do { + $form->{fromdate} = "1.9.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "10" && do { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.10.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "11" && do { + $form->{fromdate} = "1.11.$form->{year}"; + $form->{todate} = "30.11.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "12" && do { + $form->{fromdate} = "1.12.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + last SWITCH; + }; + } + } + RP->income_statement(\%myconfig, \%$form); ($form->{department}) = split /--/, $form->{department}; - - $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + + $form->{period} = + $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); $form->{todate} = $form->current_date(\%myconfig) unless $form->{todate}; # if there are any dates construct a where if ($form->{fromdate} || $form->{todate}) { - + unless ($form->{todate}) { $form->{todate} = $form->current_date(\%myconfig); } - $longtodate = $locale->date(\%myconfig, $form->{todate}, 1); + $longtodate = $locale->date(\%myconfig, $form->{todate}, 1); $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0); - - $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); + + $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0); - - $form->{this_period} = "$shortfromdate\n$shorttodate"; - $form->{period} = $locale->text('for Period').qq|\n$longfromdate |.$locale->text('Bis').qq| $longtodate|; + + $form->{this_period} = "$shortfromdate\n$shorttodate"; + $form->{period} = + $locale->text('for Period') + . qq|\n$longfromdate | + . $locale->text('Bis') + . qq| $longtodate|; } if ($form->{comparefromdate} || $form->{comparetodate}) { - $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1); - $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0); - - $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1); + $longcomparefromdate = + $locale->date(\%myconfig, $form->{comparefromdate}, 1); + $shortcomparefromdate = + $locale->date(\%myconfig, $form->{comparefromdate}, 0); + + $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1); $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0); - - $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; - $form->{period} .= "\n$longcomparefromdate ".$locale->text('Bis').qq| $longcomparetodate|; + + $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; + $form->{period} .= + "\n$longcomparefromdate " + . $locale->text('Bis') + . qq| $longcomparetodate|; } # setup variables for the form @a = qw(company address businessnumber); map { $form->{$_} = $myconfig{$_} } @a; - $form->{address} =~ s/\\n//g; $form->{templates} = $myconfig{templates}; $form->{IN} = "income_statement.html"; - + $form->parse_template; $lxdebug->leave_sub(); } - sub generate_balance_sheet { $lxdebug->enter_sub(); $form->{padding} = " "; - $form->{bold} = ""; + $form->{bold} = ""; $form->{endbold} = ""; - $form->{br} = ""; - + $form->{br} = ""; + RP->balance_sheet(\%myconfig, \%$form); $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate}; - $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); - + $form->{period} = + $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + ($form->{department}) = split /--/, $form->{department}; - + # define Current Earnings account $padding = ($form->{l_heading}) ? $form->{padding} : ""; - push(@{$form->{equity_account}}, $padding.$locale->text('Current Earnings')); + push(@{ $form->{equity_account} }, + $padding . $locale->text('Current Earnings')); $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0); - $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0); + $form->{last_period} = + $locale->date(\%myconfig, $form->{compareasofdate}, 0); $form->{IN} = "balance_sheet.html"; # setup company variables for the form - map { $form->{$_} = $myconfig{$_} } (qw(company address businessnumber nativecurr)); - $form->{address} =~ s/\\n//g; + map { $form->{$_} = $myconfig{$_}; + $form->{$_} =~ s/\\n/\n/g; } + (qw(company address businessnumber nativecurr)); $form->{templates} = $myconfig{templates}; - + $form->parse_template; $lxdebug->leave_sub(); } - sub generate_projects { $lxdebug->enter_sub(); @@ -1178,15 +1283,14 @@ sub generate_projects { $form->{projectnumber} = $form->{projectnumber_1}; $form->{nextsub} = "generate_projects"; - $form->{title} = $locale->text('Project Transactions'); + $form->{title} = $locale->text('Project Transactions'); RP->trial_balance(\%myconfig, \%$form); - + &list_accounts; $lxdebug->leave_sub(); } - # Antonio Gallardo # # D.S. Feb 16, 2001 @@ -1195,30 +1299,30 @@ sub generate_projects { # sub generate_trial_balance { $lxdebug->enter_sub(); - + # get for each account initial balance, debits and credits RP->trial_balance(\%myconfig, \%$form); $form->{nextsub} = "generate_trial_balance"; - $form->{title} = $locale->text('Trial Balance'); + $form->{title} = $locale->text('Trial Balance'); &list_accounts; $lxdebug->leave_sub(); } - sub list_accounts { $lxdebug->enter_sub(); $title = $form->escape($form->{title}); - + if ($form->{department}) { ($department) = split /--/, $form->{department}; - $options = $locale->text('Department')." : $department"; + $options = $locale->text('Department') . " : $department"; $department = $form->escape($form->{department}); } if ($form->{projectnumber}) { - $options .= $locale->text('Project Number')." : $form->{projectnumber}"; + $options .= + $locale->text('Project Number') . " : $form->{projectnumber}"; $projectnumber = $form->escape($form->{projectnumber}); } @@ -1230,28 +1334,34 @@ sub list_accounts { if ($form->{todate}) { $todate = $locale->date(\%myconfig, $form->{todate}, 1); } - + $form->{period} = "$fromdate - $todate"; } else { - $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + $form->{period} = + $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); } $options .= $form->{period}; @column_index = qw(accno description begbalance debit credit endbalance); - $column_header{accno} = qq||.$locale->text('Account').qq||; - $column_header{description} = qq||.$locale->text('Description').qq||; - $column_header{debit} = qq||.$locale->text('Debit').qq||; - $column_header{credit} = qq||.$locale->text('Credit').qq||; - $column_header{begbalance} = qq||.$locale->text('Balance').qq||; - $column_header{endbalance} = qq||.$locale->text('Balance').qq||; - + $column_header{accno} = + qq|| . $locale->text('Account') . qq||; + $column_header{description} = + qq|| . $locale->text('Description') . qq||; + $column_header{debit} = + qq|| . $locale->text('Debit') . qq||; + $column_header{credit} = + qq|| . $locale->text('Credit') . qq||; + $column_header{begbalance} = + qq|| . $locale->text('Balance') . qq||; + $column_header{endbalance} = + qq|| . $locale->text('Balance') . qq||; if ($form->{accounttype} eq 'gifi') { - $column_header{accno} = qq||.$locale->text('GIFI').qq||; + $column_header{accno} = + qq|| . $locale->text('GIFI') . qq||; } - $form->header; @@ -1277,15 +1387,14 @@ sub list_accounts { |; - - # sort the whole thing by account numbers and display foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) { $description = $form->escape($ref->{description}); - - $href = qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|; - + + $href = + qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|; + if ($form->{accounttype} eq 'gifi') { $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description"; $na = $locale->text('N/A'); @@ -1295,119 +1404,136 @@ sub list_accounts { } $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - - $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " "); - $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, " "); - $begbalance = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " "); - $endbalance = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2, " "); - -# next if ($ref->{debit} == 0 && $ref->{credit} == 0); - + + $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " "; + $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " "; + $begbalance = + $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " "); + $endbalance = + $form->format_amount(\%myconfig, + ($ref->{balance} + $ref->{amount}) * $ml, + 2, " "); + + # next if ($ref->{debit} == 0 && $ref->{credit} == 0); + if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = " " } qw(accno begbalance endbalance); + map { $column_data{$_} = " " } + qw(accno begbalance endbalance); + + $subtotalbegbalance = + $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); + $subtotalendbalance = + $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); + $subtotaldebit = + $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); + $subtotalcredit = + $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); - $subtotalbegbalance = $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); - $subtotalendbalance = $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); - $subtotaldebit = $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); - $subtotalcredit = $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); - $column_data{description} = "$subtotaldescription"; - $column_data{begbalance} = "$subtotalbegbalance"; - $column_data{endbalance} = "$subtotalendbalance"; - $column_data{debit} = "$subtotaldebit"; - $column_data{credit} = "$subtotalcredit"; - + $column_data{begbalance} = "$subtotalbegbalance"; + $column_data{endbalance} = "$subtotalendbalance"; + $column_data{debit} = "$subtotaldebit"; + $column_data{credit} = "$subtotalcredit"; + print qq| |; map { print "$column_data{$_}\n" } @column_index; - + print qq| |; } - + if ($ref->{charttype} eq "H") { - $subtotal = 1; + $subtotal = 1; $subtotaldescription = $ref->{description}; - $subtotaldebit = $ref->{debit}; - $subtotalcredit = $ref->{credit}; - $subtotalbegbalance = 0; - $subtotalendbalance = 0; + $subtotaldebit = $ref->{debit}; + $subtotalcredit = $ref->{credit}; + $subtotalbegbalance = 0; + $subtotalendbalance = 0; next unless $form->{l_heading}; - - map { $column_data{$_} = " " } qw(accno debit credit begbalance endbalance); - $column_data{description} = "$ref->{description}"; + + map { $column_data{$_} = " " } + qw(accno debit credit begbalance endbalance); + $column_data{description} = + "$ref->{description}"; } if ($ref->{charttype} eq "A") { - $column_data{accno} = "$ref->{accno}"; + $column_data{accno} = "$ref->{accno}"; $column_data{description} = "$ref->{description}"; - $column_data{debit} = "$debit"; - $column_data{credit} = "$credit"; - $column_data{begbalance} = "$begbalance"; - $column_data{endbalance} = "$endbalance"; - - $totaldebit += $ref->{debit}; + $column_data{debit} = "$debit"; + $column_data{credit} = "$credit"; + $column_data{begbalance} = "$begbalance"; + $column_data{endbalance} = "$endbalance"; + + $totaldebit += $ref->{debit}; $totalcredit += $ref->{credit}; $subtotalbegbalance += $ref->{balance} * $ml; $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml; } - + if ($ref->{charttype} eq "H") { print qq| |; } if ($ref->{charttype} eq "A") { - $i++; $i %= 2; + $i++; + $i %= 2; print qq| |; } - + map { print "$column_data{$_}\n" } @column_index; - + print qq| |; } - # print last subtotal if ($subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = " " } qw(accno begbalance endbalance); - $subtotalbegbalance = $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); - $subtotalendbalance = $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); - $subtotaldebit = $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); - $subtotalcredit = $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); + map { $column_data{$_} = " " } + qw(accno begbalance endbalance); + $subtotalbegbalance = + $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); + $subtotalendbalance = + $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); + $subtotaldebit = + $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); + $subtotalcredit = + $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); $column_data{description} = "$subdescription"; - $column_data{begbalance} = "$subtotalbegbalance"; - $column_data{endbalance} = "$subtotalendbalance"; - $column_data{debit} = "$subtotaldebit"; - $column_data{credit} = "$subtotalcredit"; - + $column_data{begbalance} = "$subtotalbegbalance"; + $column_data{endbalance} = "$subtotalendbalance"; + $column_data{debit} = "$subtotaldebit"; + $column_data{credit} = "$subtotalcredit"; + print qq| |; map { print "$column_data{$_}\n" } @column_index; - + print qq| |; } - - $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, " "); + + $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, " "); $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, " "); - map { $column_data{$_} = " " } qw(accno description begbalance endbalance); - - $column_data{debit} = qq|$totaldebit|; + map { $column_data{$_} = " " } + qw(accno description begbalance endbalance); + + $column_data{debit} = qq|$totaldebit|; $column_data{credit} = qq|$totalcredit|; - + print qq| |; @@ -1431,73 +1557,79 @@ sub list_accounts { $lxdebug->leave_sub(); } - sub generate_ar_aging { $lxdebug->enter_sub(); # split customer ($form->{customer}) = split(/--/, $form->{customer}); - $customer = $form->escape($form->{customer},1); - $title = $form->escape($form->{title},1); + $customer = $form->escape($form->{customer}, 1); + $title = $form->escape($form->{title}, 1); - $form->{ct} = "customer"; + $form->{ct} = "customer"; $form->{arap} = "ar"; - $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|; + $form->{callback} = + qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|; RP->aging(\%myconfig, \%$form); &aging; - + $lxdebug->leave_sub(); } - sub generate_ap_aging { $lxdebug->enter_sub(); - + # split vendor ($form->{vendor}) = split(/--/, $form->{vendor}); - $vendor = $form->escape($form->{vendor},1); - $title = $form->escape($form->{title},1); + $vendor = $form->escape($form->{vendor}, 1); + $title = $form->escape($form->{title}, 1); - $form->{ct} = "vendor"; + $form->{ct} = "vendor"; $form->{arap} = "ap"; - - $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|; + + $form->{callback} = + qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|; RP->aging(\%myconfig, \%$form); &aging; - + $lxdebug->leave_sub(); } - sub aging { $lxdebug->enter_sub(); - $form->header; $column_header{statement} = qq| |; - $column_header{ct} = qq||.$locale->text(ucfirst $form->{ct}).qq||; - $column_header{invnumber} = qq||.$locale->text('Invoice').qq||; - $column_header{transdate} = qq||.$locale->text('Date').qq||; - $column_header{duedate} = qq||.$locale->text('Due').qq||; - $column_header{c0} = qq||.$locale->text('Current').qq||; + $column_header{ct} = + qq|| + . $locale->text(ucfirst $form->{ct}) + . qq||; + $column_header{invnumber} = + qq|| . $locale->text('Invoice') . qq||; + $column_header{transdate} = + qq|| . $locale->text('Date') . qq||; + $column_header{duedate} = + qq|| . $locale->text('Due') . qq||; + $column_header{c0} = + qq|| . $locale->text('Current') . qq||; $column_header{c30} = qq|30|; $column_header{c60} = qq|60|; $column_header{c90} = qq|90|; - - @column_index = (qw(statement ct invnumber transdate duedate c0 c30 c60 c90)); + + @column_index = + (qw(statement ct invnumber transdate duedate c0 c30 c60 c90)); if ($form->{department}) { - $option .= "\n" if $option; - ($department) = split /--/, $form->{department}; - $option .= $locale->text('Department')." : $department"; - $department = $form->escape($form->{department},1); - $form->{callback} .= "&department=$department"; + $option .= "\n" if $option; + ($department) = split /--/, $form->{department}; + $option .= $locale->text('Department') . " : $department"; + $department = $form->escape($form->{department}, 1); + $form->{callback} .= "&department=$department"; } - + if ($form->{arap} eq 'ar') { if ($form->{customer}) { $option .= "\n" if $option; @@ -1511,10 +1643,11 @@ sub aging { $option .= $form->{vendor}; } } - + $todate = $locale->date(\%myconfig, $form->{todate}, 1); $option .= "\n" if $option; - $option .= $locale->text('for Period')." ".$locale->text('Bis')." $todate"; + $option .= + $locale->text('for Period') . " " . $locale->text('Bis') . " $todate"; print qq| @@ -1536,15 +1669,14 @@ sub aging { |; map { print "$column_header{$_}\n" } @column_index; - + print qq| |; - - $ctid = 0; + $ctid = 0; $subtotal = 0; - $i = 0; + $i = 0; foreach $ref (@{ $form->{AG} }) { @@ -1553,75 +1685,88 @@ sub aging { $i++; if ($subtotal) { - $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, " "); - $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, " "); - $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, " "); - $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, " "); + $c0subtotal = ($c0subtotal != 0) ? + $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : ""; + $c30subtotal = ($c30subtotal != 0) ? + $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : ""; + $c60subtotal = ($c60subtotal != 0) ? + $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : ""; + $c90subtotal = ($c90subtotal != 0) ? + $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : ""; } - - $column_data{ct} = qq| |; + + $column_data{ct} = qq| |; $column_data{invnumber} = qq| |; $column_data{transdate} = qq| |; - $column_data{duedate} = qq| |; - $column_data{c0} = qq|$c0subtotal|; - $column_data{c30} = qq|$c30subtotal|; - $column_data{c60} = qq|$c60subtotal|; - $column_data{c90} = qq|$c90subtotal|; - + $column_data{duedate} = qq| |; + $column_data{c0} = + qq|$c0subtotal|; + $column_data{c30} = + qq|$c30subtotal|; + $column_data{c60} = + qq|$c60subtotal|; + $column_data{c90} = + qq|$c90subtotal|; + if ($subtotal) { - # print subtotals - print qq| + + # print subtotals + print qq| |; - map { print "$column_data{$_}\n" } @column_index; + map { print "$column_data{$_}\n" } @column_index; - $column_data{statement} = qq| |; + $column_data{statement} = qq| |; - print qq| + print qq| |; } - + $subtotal = 1; - $c0subtotal = 0; + $c0subtotal = 0; $c30subtotal = 0; $c60subtotal = 0; $c90subtotal = 0; - $column_data{ct} = qq|$ref->{name}|; - $column_data{statement} = qq|{checked}> + $column_data{ct} = qq|$ref->{name}|; + $column_data{statement} = + qq|{checked}> {ctid}> |; } - $c0subtotal += $ref->{c0}; + $c0subtotal += $ref->{c0}; $c30subtotal += $ref->{c30}; $c60subtotal += $ref->{c60}; $c90subtotal += $ref->{c90}; - $c0total += $ref->{c0}; + $c0total += $ref->{c0}; $c30total += $ref->{c30}; $c60total += $ref->{c60}; $c90total += $ref->{c90}; - $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, " "); - $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, " "); - $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, " "); - $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, " "); - - $href = qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|.$form->escape($form->{callback}); - + $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : ""; + $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : ""; + $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : ""; + $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : ""; + + $href = + qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| + . $form->escape($form->{callback}); + $column_data{invnumber} = qq|$ref->{invnumber}|; $column_data{transdate} = qq|$ref->{transdate}|; - $column_data{duedate} = qq|$ref->{duedate} |; - $column_data{c0} = qq|$ref->{c0}|; - $column_data{c30} = qq|$ref->{c30}|; - $column_data{c60} = qq|$ref->{c60}|; - $column_data{c90} = qq|$ref->{c90}|; - - $j++; $j %= 2; + $column_data{duedate} = qq|$ref->{duedate} |; + $column_data{c0} = qq|$ref->{c0}|; + $column_data{c30} = qq|$ref->{c30}|; + $column_data{c60} = qq|$ref->{c60}|; + $column_data{c90} = qq|$ref->{c90}|; + + $j++; + $j %= 2; print qq| |; @@ -1631,53 +1776,50 @@ sub aging { print qq| |; - - $column_data{ct} = qq| |; + + $column_data{ct} = qq| |; $column_data{statement} = qq| |; $ctid = $ref->{ctid}; } - + # print subtotals - $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, " "); + $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, " "); $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, " "); $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, " "); $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, " "); - + print qq| |; map { $column_data{$_} = qq| | } @column_index; - $column_data{c0} = qq|$c0subtotal|; + $column_data{c0} = qq|$c0subtotal|; $column_data{c30} = qq|$c30subtotal|; $column_data{c60} = qq|$c60subtotal|; $column_data{c90} = qq|$c90subtotal|; map { print "$column_data{$_}\n" } @column_index; - - + print qq| |; - $c0total = $form->format_amount(\%myconfig, $c0total, 2, " "); + $c0total = $form->format_amount(\%myconfig, $c0total, 2, " "); $c30total = $form->format_amount(\%myconfig, $c30total, 2, " "); $c60total = $form->format_amount(\%myconfig, $c60total, 2, " "); $c90total = $form->format_amount(\%myconfig, $c90total, 2, " "); - - $column_data{c0} = qq|$c0total|; + + $column_data{c0} = qq|$c0total|; $column_data{c30} = qq|$c30total|; $column_data{c60} = qq|$c60total|; $column_data{c90} = qq|$c90total|; - map { print "$column_data{$_}\n" } @column_index; - print qq| @@ -1714,20 +1856,17 @@ sub aging { {path}> {login}> {password}> - - - - - -|; - } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + + + +|; +} - print qq| +print qq| @@ -1737,7 +1876,6 @@ sub aging { $lxdebug->leave_sub(); } - sub select_all { $lxdebug->enter_sub(); @@ -1750,64 +1888,6 @@ sub select_all { $lxdebug->leave_sub(); } - -sub print_options { - $lxdebug->enter_sub(); - - $form->{sendmode} = "attachment"; - $form->{copies} = 2 unless $form->{copies}; - - $form->{PD}{$form->{type}} = "selected"; - $form->{DF}{$form->{format}} = "selected"; - $form->{OP}{$form->{media}} = "selected"; - $form->{SM}{$form->{sendmode}} = "selected"; - - $type = qq| - {PD}{statement}>|.$locale->text('Statement'); - - if ($form->{media} eq 'email') { - $media = qq| - {SM}{attachment}>|.$locale->text('Attachment').qq| - {SM}{inline}>|.$locale->text('In-line'); - } else { - $media = qq| - {OP}{screen}>|.$locale->text('Screen'); - if ($myconfig{printer} && $latex) { - $media .= qq| - {OP}{printer}>|.$locale->text('Printer'); - } - } - - if ($latex) { - $format .= qq| - {DF}{postscript}>|.$locale->text('Postscript').qq| - {DF}{pdf}>|.$locale->text('PDF'); - } - - print qq| - - - $type - $format - $media -|; - - if ($myconfig{printer} && $latex && $form->{media} ne 'email') { - print qq| - |.$locale->text('Copies').qq| - {copies}> -|; - } - - print qq| - - -|; - - $lxdebug->leave_sub(); -} - - sub e_mail { $lxdebug->enter_sub(); @@ -1825,15 +1905,15 @@ sub e_mail { if ($myconfig{role} eq 'admin') { $bcc = qq| - |.$locale->text('Bcc').qq| + | . $locale->text('Bcc') . qq| |; } - $title = $locale->text('E-mail Statement to')." $form->{$form->{ct}}"; + $title = $locale->text('E-mail Statement to') . " $form->{$form->{ct}}"; $form->{media} = "email"; - + $form->header; print qq| @@ -1850,13 +1930,13 @@ sub e_mail { - |.$locale->text('E-mail').qq| + | . $locale->text('E-mail') . qq| - |.$locale->text('Cc').qq| + | . $locale->text('Cc') . qq| - |.$locale->text('Subject').qq| + | . $locale->text('Subject') . qq| $bcc @@ -1867,7 +1947,7 @@ sub e_mail { - |.$locale->text('Message').qq| + | . $locale->text('Message') . qq| $form->{message} @@ -1881,7 +1961,8 @@ sub e_mail { &print_options; - map { delete $form->{$_} } qw(action email cc bcc subject message type sendmode format header); + map { delete $form->{$_} } + qw(action email cc bcc subject message type sendmode format header); # save all other variables foreach $key (keys %$form) { @@ -1900,7 +1981,8 @@ sub e_mail { - +