X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=f08daabfde2218e79c95bc7b3327eae3faa28aa2;hb=2fda509c7dc417aad28ed072e91e8ffe2396314d;hp=714d693939382e6c5335d7ce0861f10654307bc3;hpb=214bc380078e686f3834060df8066bba7e1e8098;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 714d69393..f08daabfd 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 @@ -277,13 +269,6 @@ sub order_links { $form->{employee} = "$form->{employee}--$form->{employee_id}"; - # sales staff - if (@{ $form->{all_employees} }) { - $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "\n" } - (@{ $form->{all_employees} }); - } - # forex $form->{forex} = $form->{exchangerate}; @@ -361,12 +346,12 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - {transdate}> + text('button') . qq|> |; $button2 = qq| - {reqdate}> + text('button') . qq|> |; @@ -380,35 +365,37 @@ sub form_header { # without JavaScript Calendar $button1 = qq| - {transdate}>|; + |; $button2 = qq| - {reqdate}>|; + |; } - if ($form->{id}) { - $openclosed = qq| - - - - -|; + my @tmp; - if (($form->{"type"} eq "sales_order") || - ($form->{"type"} eq "purchase_order")) { - $openclosed .= qq| + if (($form->{"type"} eq "sales_order") || + ($form->{"type"} eq "purchase_order")) { + push(@tmp, qq| - -|; - } + |); + } + + if ($form->{id}) { + push(@tmp, qq| + + |); + } + if (@tmp) { $openclosed .= qq| + + | . join("\n", @tmp) . qq| |; } # set option selected - foreach $item ($form->{vc}, currency, department, employee) { + foreach $item ($form->{vc}, currency, department, employee, ($form->{vc} eq "customer" ? customer : vendor)) { $form->{"select$item"} =~ s/ selected//; $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; @@ -429,8 +416,13 @@ sub form_header { "projects" => { "key" => "ALL_PROJECTS", "all" => 0, "old_id" => \@old_project_ids }, - "employees" => "ALL_SALESMEN"); - + "employees" => "ALL_SALESMEN", + "taxzones" => "ALL_TAXZONES", + "currencies" => "ALL_CURRENCIES"); + ($form->{vc} eq "customer" + ? $form->get_lists("customers" => "ALL_CUSTOMERS") + : $form->get_lists("vendors" => "ALL_VENDORS")); + my %labels; my @values = (undef); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { @@ -442,6 +434,25 @@ sub form_header { NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-labels' => \%labels, '-default' => $form->{"cp_id"})); + %labels = (); + @values = (); + + foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) { + push(@values, $item->{name}.qq|--|.$item->{"id"}); + $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"}; + } + + my $vc = qq| + | . $locale->text(ucfirst($form->{vc})) . qq| + | . + (($myconfig{vclimit} == 1 ) + ? qq|| + : (NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, + '-onChange' => 'document.getElementById(\'update_button\').click();', + '-values' => \@values, '-labels' => \%labels)))) . qq| + {vc}"}) . qq|">|; + %labels = (); @values = (""); foreach my $item (@{ $form->{"ALL_SHIPTO"} }) { @@ -487,6 +498,57 @@ sub form_header { |; } + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"name"}; + } + + my $employees = qq| + + | . $locale->text('Employee') . qq| + | . + NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_TAXZONES"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"description"}; + } + + $taxzone = qq| + + | . $locale->text('Steuersatz') . qq| + | . + NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + + %labels = (); + @values = (); + my $i = 0; + foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) { + push(@values, $item); + $labels{$item} = $item; + } + + $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; + my $currencies = qq| + + | . $locale->text('Currency') . qq| + | . + NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + + $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); @@ -521,11 +583,6 @@ sub form_header { } } - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - - - if ($form->{business}) { $business = qq| @@ -558,34 +615,6 @@ sub form_header { |; } - if (@{ $form->{TAXZONE} }) { - $form->{selecttaxzone} = ""; - foreach $item (@{ $form->{TAXZONE} }) { - if ($item->{id} == $form->{taxzone_id}) { - $form->{selecttaxzone} .= - ""; - } else { - $form->{selecttaxzone} .= - ""; - } - - } - } else { - $form->{selecttaxzone} =~ s/ selected//g; - if ($form->{taxzone_id} ne "") { - $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}>/value=$form->{taxzone_id} selected>/; - } - } - - $taxzone = qq| - - | . $locale->text('Steuersatz') . qq| - - - |; - - if ($form->{type} !~ /_quotation$/) { $ordnumber = qq| @@ -673,47 +702,25 @@ sub form_header { |; } - $vc = - ($form->{"select$form->{vc}"}) - ? qq|\n{vc}"}) . qq|">| - : qq|{vc} value="$form->{$form->{vc}}" size=35>|; - $department = qq| | . $locale->text('Department') . qq| - -| if $form->{selectdepartment}; - - $employee = qq| - -|; + | if $form->{selectdepartment}; if ($form->{type} eq 'sales_order') { if ($form->{selectemployee}) { $employee = qq| {customer_klass}> - - | . $locale->text('Employee') . qq| - - - - + $employees |; } } else { $employee = qq| {customer_klass}> - - | . $locale->text('Employee') . qq| - - - - + $employees |; } if ($form->{resubmit} && ($form->{format} eq "html")) { @@ -722,14 +729,17 @@ sub form_header { } elsif ($form->{resubmit}) { $onload = qq|document.oe.submit()|; } else { - $onload = "fokus()"; + $onload = "focus()"; } $credittext = $locale->text('Credit Limit exceeded!!!'); if ($creditwarning) { $onload = qq|alert('$credittext')|; } - + + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; + $form->{"javascript"} .= qq||; # show history button js $form->{javascript} .= qq||; @@ -782,10 +792,7 @@ sub form_header { - - - {vc}_id value=$form->{"$form->{vc}_id"}> - {vc}"}"> + $vc @@ -796,10 +803,7 @@ sub form_header { $taxzone $department - - - - {defaultcurrency}> + $currencies $exchangerate @@ -809,7 +813,11 @@ sub form_header { - |; + + + + + |; # #
$vclabel$vc| . $locale->text('Contact Person') . qq| $contact
| . $locale->text('Currency') . qq|
| . $locale->text('Ship via') . qq|
| . $locale->text('Transaction description') . qq|
# @@ -1062,7 +1070,7 @@ sub form_footer { @@ -1157,7 +1165,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -1346,20 +1353,6 @@ sub search { $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - map { $vc .= "\n" } - @{ $form->{"all_$form->{vc}"} }; - - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - - # $locale->text('Vendor') - # $locale->text('Customer') - - $vc = - ($vc) - ? qq|| - : qq|{vc} size=35>|; - # departments if (@{ $form->{all_departments} }) { $form->{selectdepartment} = " |; $button2 = qq| - |; @@ -1415,9 +1408,9 @@ sub search { # without JavaScript Calendar $button1 = qq| - |; + |; $button2 = qq| - |; + |; } $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -1449,14 +1442,17 @@ sub search {
|; - &print_options; + print_options(); print qq| + text('button') . qq|> + text('button') . qq|> - - + $vc $department + + + + @@ -1489,7 +1485,7 @@ sub search { . $locale->text('Required by') . qq| - + @@ -1502,8 +1498,12 @@ sub search { . $locale->text('Tax') . qq| + + + |; + $column_header{transaction_description} = + qq||; $column_header{ids} = qq||; @@ -1766,7 +1767,7 @@ sub orders { $column_data{reqdate} = ""; $column_data{$ordnumber} = - ""; + ""; $column_data{name} = ""; $column_data{employee} = ""; @@ -1783,6 +1784,7 @@ sub orders { $column_data{"delivered"} = ""; + $column_data{transaction_description} = ""; $i++; $i %= 2; @@ -1834,7 +1836,6 @@ sub orders { if ($form->{type} =~ /sales_order/) { print qq| - @@ -1857,7 +1858,6 @@ sub orders { {type}> {vc}> -{path}> {login}> {password}> @@ -1975,6 +1975,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)); } @@ -2056,6 +2057,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)); } @@ -2127,6 +2129,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)); } @@ -2240,7 +2243,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); @@ -2321,7 +2324,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}> @@ -2475,6 +2477,10 @@ sub purchase_order { OE->close_order(\%myconfig, \%$form); } + if ($form->{type} =~ /^sales_/) { + delete($form->{ordnumber}); + } + $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Purchase Order'); @@ -2494,6 +2500,10 @@ sub sales_order { OE->close_order(\%myconfig, $form); } + if ($form->{type} eq "purchase_order") { + delete($form->{ordnumber}); + } + $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Sales Order');
$vclabel$vc
$ordlabel
| . $locale->text('Transaction description') . qq|
| . $locale->text("Project Number") . qq| $projectnumber
$vclabel ucfirst($form->{vc}) $employee | . $locale->text('Ship via') . qq| | . $locale->text('Total') . qq|
| . $locale->text('Project Number') . qq| | + . $locale->text('Transaction description') . qq|
| @@ -1522,7 +1522,6 @@ $jsscript
-{path}> {login}> {password}> {vc}> @@ -1550,27 +1549,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}); @@ -1664,6 +1662,9 @@ sub orders { $column_header{employee} = qq|		$employee| + . $locale->text("Transaction description") . qq|$oe->{reqdate} {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}$oe->{name}$oe->{employee} " . ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) . "" . H($oe->{transaction_description}) . "