X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=faaad58280a10c687612e0da15401241730be696;hb=2fda509c7dc417aad28ed072e91e8ffe2396314d;hp=dc9238a34877afa0a45f45269cb4431ba1a916f5;hpb=d333f237fcd8ef1d9145b7b51072f7088b857301;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index dc9238a34..faaad5828 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -34,7 +34,7 @@ use SL::GL; use SL::PE; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; 1; @@ -75,7 +75,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; # we use this only to set a default date @@ -233,12 +233,12 @@ sub search { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; @@ -251,15 +251,17 @@ sub search { # without JavaScript Calendar $button1 = - qq||; + qq||; $button2 = - qq||; + qq||; } - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +
{script}> @@ -362,7 +364,6 @@ $jsscript -{path}> {login}> {password}> @@ -385,7 +386,7 @@ sub generate_report { GL->all_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=generate_report&login=$form->{login}&password=$form->{password}"; $href = $callback; @@ -766,7 +767,7 @@ sub generate_report { $column_data{id} = " $ref->{id} "; $column_data{transdate} = "$transdate"; $column_data{reference} = - "{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}"; + "{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}"; $column_data{description} = "$ref->{description} "; $column_data{source} = "$ref->{source} "; $column_data{notes} = "$ref->{notes} "; @@ -869,7 +870,6 @@ sub generate_report { -{path}> {login}> {password}> @@ -1296,7 +1296,7 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -1308,7 +1308,7 @@ sub form_header { # without JavaScript Calendar $button1 = - qq||; + qq||; } $form->header; @@ -1334,7 +1334,7 @@ sub form_header { - + @@ -1365,7 +1365,7 @@ sub form_header { if ($form->{id}) { print qq| - + @@ -1453,7 +1453,6 @@ sub form_footer {
| . $locale->text('Reference') . qq|| . $locale->text('Reference') . qq| @@ -1354,7 +1354,7 @@ sub form_header {
- +
| . $locale->text('Buchungsdatum') . qq|{gldate} $readonly>{gldate} $readonly onBlur=\"check_right_date_format(this)\">
| . $locale->text('Description') . qq|| . $locale->text('Description') . qq| $description @@ -1379,7 +1379,7 @@ sub form_header {
- +
| . $locale->text('Mitarbeiter') . qq|{employee} $readonly>
-{path}> {login}> {password}> @@ -1542,6 +1541,7 @@ sub yes { if (GL->delete_transaction(\%myconfig, \%$form)){ # 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)); } @@ -1735,6 +1735,7 @@ sub post { undef($form->{callback}); # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "SAVED"; $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id}; $form->save_history($form->dbconnect(\%myconfig)); @@ -1761,6 +1762,7 @@ sub storno { $form->{storno} = 1; # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "STORNO"; $form->save_history($form->dbconnect(\%myconfig)); }