X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frc.pl;h=4df612cc57ad353a70d0230d29fb5184402512d9;hb=fc490063361896eb3b2aa0939fc0df716ae38262;hp=9dfb1e1c54c85e137c21505f1d034be6464f8345;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl index 9dfb1e1c5..4df612cc5 100644 --- a/bin/mozilla/rc.pl +++ b/bin/mozilla/rc.pl @@ -33,6 +33,8 @@ use SL::RC; +require "bin/mozilla/common.pl"; + 1; # end of main @@ -47,11 +49,14 @@ sub reconciliation { @{ $form->{PR} }; $form->{title} = $locale->text('Reconciliation'); - + $form->{javascript} .= qq||; + $form->{"jsscript"} = 1; $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; print qq| - +
{script}> @@ -70,9 +75,11 @@ sub reconciliation { | . $locale->text('From') . qq| - - | . $locale->text('To') . qq| - + + + | . $locale->text('Until') . qq| + + @@ -82,10 +89,13 @@ sub reconciliation { +| . $form->write_trigger(\%myconfig, 2, + "fromdate", "BL", "trigger_fromdate", + "todate", "BL", "trigger_todate") . qq| +
-{path}> {login}> {password}> @@ -101,7 +111,7 @@ sub reconciliation { $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } +sub continue { call_sub($form->{"nextsub"}); } sub get_payments { $lxdebug->enter_sub(); @@ -147,13 +157,13 @@ sub display_form { $option .= "\n
" if ($option); $option .= $locale->text('From') . " " - . $locale->date(\%myconfig, $form->{fromdate}, 1); + . $locale->date(\%myconfig, $form->{fromdate}, 0); } if ($form->{todate}) { $option .= "\n
" if ($option); $option .= - $locale->text('To') . " " - . $locale->date(\%myconfig, $form->{todate}, 1); + $locale->text('Until') . " " + . $locale->date(\%myconfig, $form->{todate}, 0); } $form->{title} = "$form->{accno}--$form->{account}"; @@ -298,11 +308,10 @@ sub display_form { $clearedbalance = $form->format_amount(\%myconfig, $clearedbalance, 2, 0); if ($fx) { - $fx = $form->format_amount(\%myconfig, $fx, 2, 0); + $fx = $form->format_amount(\%myconfig, $fx, 2, 0); $exchdiff = qq| | - . $locale->text('Exchangerate Difference') - . qq| + . $locale->text('Exchangerate Difference') . qq| $fx |; @@ -360,7 +369,6 @@ sub display_form { {fromdate}> {todate}> -{path}> {login}> {password}> @@ -370,14 +378,8 @@ sub display_form { |; + . $locale->text('Done') . qq|"> - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq|
@@ -421,7 +423,7 @@ sub done { $lxdebug->enter_sub(); $form->{callback} = - "$form->{script}?path=$form->{path}&action=reconciliation&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=reconciliation&login=$form->{login}&password=$form->{password}"; $form->error($locale->text('Out of balance!')) if ($form->{difference} *= 1);