X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=3c55ee58f60248b7c6e95be9e63c1c421652b71a;hb=ce3ce404919a3e39c4b966db7b7d02076cd8c7e5;hp=173ad770fdefefaafcf7cb711f6cee2db7d5626b;hpb=6e50e0c2879d0e9b4dbb13b84a51d24388fc8d1f;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 173ad770f..3c55ee58f 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; @@ -254,14 +254,6 @@ sub order_links { (@{ $form->{"all_$form->{vc}"} }); } - # currencies - @curr = split(/:/, $form->{currencies}); - chomp $curr[0]; - $form->{defaultcurrency} = $curr[0]; - $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - - map { $form->{selectcurrency} .= "\n" } @curr; - $form->{taxincluded} = $taxincluded if ($form->{id}); # departments @@ -361,12 +353,12 @@ sub form_header { # with JavaScript Calendar $button1 = qq| -
|; - &print_options; + print_options(); print qq| | @@ -1158,7 +1166,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -1398,12 +1405,12 @@ sub search { # with JavaScript Calendar $button1 = qq| -+ | text('button') . qq|> | |; $button2 = qq| -+ | text('button') . qq|> | |; @@ -1416,9 +1423,9 @@ sub search { # without JavaScript Calendar $button1 = qq| -|; + | |; $button2 = qq| - | |; + | |; } $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -1458,6 +1465,10 @@ sub search { | $ordlabel | |||
---|---|---|---|---|---|---|---|---|---|---|---|---|
| . $locale->text('Transaction description') . qq| | ++ | |||||||||||
| . $locale->text("Project Number") . qq| | $projectnumber | @@ -1503,8 +1514,12 @@ sub search { . $locale->text('Tax') . qq|| . $locale->text('Total') . qq| | +||||||||||
| . $locale->text('Project Number') . qq| | +| + . $locale->text('Transaction description') . qq| | |||||||||||
|
@@ -1523,7 +1538,6 @@ $jsscript
-{path}> {login}> {password}> {vc}> @@ -1551,27 +1565,26 @@ sub orders { $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; - $number = $form->escape($form->{$ordnumber}); - $name = $form->escape($form->{ $form->{vc} }); - $department = $form->escape($form->{department}); - # 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"; - - # construct callback - $number = $form->escape($form->{$ordnumber}, 1); - $name = $form->escape($form->{ $form->{vc} }, 1); - $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"; - - @columns = - $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", - "name", "netamount", "tax", "amount", - "curr", "employee", "shipvia", "globalprojectnumber", - "open", "closed", "delivered"); + my @fields = + qw(type vc login password transdatefrom transdateto + open closed notdelivered delivered department + transaction_description); + $href = "$form->{script}?action=orders&" + . join("&", map { "${_}=" . E($form->{$_}) } @fields) + . "&${ordnumber}=" . E($form->{$ordnumber}); + $callback = $href; + + @columns = ( + "transdate", "reqdate", + "id", "$ordnumber", + "name", "netamount", + "tax", "amount", + "curr", "employee", + "shipvia", "globalprojectnumber", + "transaction_description", "open", + "closed", "delivered" + ); $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); @@ -1665,6 +1678,9 @@ sub orders { $column_header{employee} = qq| | $employee | |; + $column_header{transaction_description} = + qq|| + . $locale->text("Transaction description") . qq| | |; $column_header{ids} = qq||; @@ -1767,7 +1783,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} | "; @@ -1784,6 +1800,7 @@ sub orders { $column_data{"delivered"} = "" . ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) . " | "; + $column_data{transaction_description} = "" . H($oe->{transaction_description}) . " | "; $i++; $i %= 2; @@ -1835,7 +1852,6 @@ sub orders { if ($form->{type} =~ /sales_order/) { print qq| - @@ -1858,7 +1874,6 @@ sub orders { {type}> {vc}> -{path}> {login}> {password}> @@ -1976,6 +1991,7 @@ 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)); } @@ -2057,6 +2073,7 @@ sub save { # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -2128,6 +2145,7 @@ sub yes { $form->redirect($msg); # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -2241,7 +2259,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); @@ -2322,7 +2340,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}>