X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=e076691a1b326263f13d93e0606ddbc42ec78d2c;hb=a9d015d8e68020faaed94c1d9db08e0151b84c92;hp=1e0c8a6c6d38833db7f2bb6de4de3b376f1c8d84;hpb=ddbe3ea5ec297a58acc9ee3afc17156fb97be7f2;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 1e0c8a6c6..e076691a1 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -37,8 +37,8 @@ use SL::IR; use SL::IS; use SL::PE; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; 1; @@ -98,7 +98,7 @@ sub add { set_headings("add"); $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &order_links; @@ -1153,7 +1153,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -1518,7 +1517,6 @@ $jsscript
-{path}> {login}> {password}> {vc}> @@ -1552,7 +1550,7 @@ sub orders { # construct href $href = - "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; + "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; # construct callback $number = $form->escape($form->{$ordnumber}, 1); @@ -1560,7 +1558,7 @@ sub orders { $department = $form->escape($form->{department}, 1); $callback = - "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; + "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; @columns = $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", @@ -1762,7 +1760,7 @@ sub orders { $column_data{reqdate} = "$oe->{reqdate} "; $column_data{$ordnumber} = - "{path}&action=$action&type=$form->{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}"; + "{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}"; $column_data{name} = "$oe->{name}"; $column_data{employee} = "$oe->{employee} "; @@ -1830,7 +1828,6 @@ sub orders { if ($form->{type} =~ /sales_order/) { print qq| - @@ -1853,7 +1850,6 @@ sub orders { {type}> {vc}> -{path}> {login}> {password}> @@ -2239,7 +2235,7 @@ sub invoice { # locale messages $locale = new Locale "$myconfig{countrycode}", "$script"; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -2320,7 +2316,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}>