X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=f7a52e979f42cd078e6a21dc6d9a29c576511d69;hb=5b47ed3efe5f4ef0810096b0f4849047cee54690;hp=e281da720d20e01c7513affc42337971e9cefbd0;hpb=8a996479a2d9daea50b2ead5426a962145101896;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index e281da720..f7a52e979 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -284,7 +284,6 @@ sub order_links { sub prepare_order { $lxdebug->enter_sub(); - $form->{media} = "screen"; $form->{formname} = $form->{type} unless $form->{formname}; my $i = 0; @@ -328,8 +327,8 @@ sub prepare_order { sub form_header { $lxdebug->enter_sub(); - $checkedopen = ($form->{closed}) ? "" : "checked"; - $checkedclosed = ($form->{closed}) ? "checked" : ""; + my $checkedclosed = $form->{"closed"} ? "checked" : ""; + my $checkeddelivered = $form->{"delivered"} ? "checked" : ""; map { $form->{$_} =~ s/\"/"/g } qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname @@ -380,15 +379,20 @@ sub form_header { $openclosed = qq| - - - - - -
| - . $locale->text('Open') . qq| | - . $locale->text('Closed') . qq|
- + + +|; + + if (($form->{"type"} eq "sales_order") || + ($form->{"type"} eq "purchase_order")) { + $openclosed .= qq| + + +|; + } + + $openclosed .= qq| + |; } @@ -432,11 +436,12 @@ sub form_header { ""; } else { $form->{selectshipto} .= - ""; + ""; } } } else { + $form->{selectshipto} = $form->unquote($form->{selectshipto}); $form->{selectshipto} =~ s/ selected//g; if ($form->{shipto_id} ne "") { $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/; @@ -445,9 +450,9 @@ sub form_header { $shipto = qq| | . $locale->text('Shipping Address') . qq| - - |; - + |; + $form->{selectshipto} = $form->quote($form->{selectshipto}); + $shipto .= qq| |; @@ -493,13 +498,7 @@ sub form_header { $vclabel = ucfirst $form->{vc}; $vclabel = $locale->text($vclabel); - $terms = qq| - - | . $locale->text('Terms: Net') . qq| - {terms}> | - . $locale->text('days') . qq| - -|; + if ($form->{business}) { $business = qq| @@ -600,7 +599,7 @@ sub form_header { $form->{creditlimit} | . $locale->text('Remaining') . qq| - $form->{creditremaining} + $form->{creditremaining} @@ -630,7 +629,6 @@ sub form_header { |; - $terms = ""; } $ordnumber .= qq| @@ -704,6 +702,8 @@ sub form_header { $onload = qq|alert('$credittext')|; } + $form->{"javascript"} .= qq||; + $form->header; print qq| @@ -807,7 +807,6 @@ print qq| $openclosed $employee $ordnumber - $terms @@ -1034,7 +1033,7 @@ sub form_footer { | . $locale->text("Edit the $form->{type}") . qq|
-text('Update') . qq|"> @@ -1107,11 +1106,6 @@ sub form_footer { |; } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print qq| {rowcount}> @@ -1393,6 +1387,19 @@ sub search { |; } + my $delivered; + if (($form->{"type"} eq "sales_order") || + ($form->{"type"} eq "purchase_order")) { + $delivered = qq| + + + + + + +|; + } + # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; $jsscript = ""; @@ -1460,6 +1467,7 @@ sub search { $openclosed + $delivered @@ -1535,7 +1543,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}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse"; + "$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&warehouse=$warehouse"; # construct callback $number = $form->escape($form->{$ordnumber}, 1); @@ -1544,17 +1552,20 @@ sub orders { $warehouse = $form->escape($form->{warehouse}, 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}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse"; + "$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&warehouse=$warehouse"; @columns = $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", "name", "netamount", "tax", "amount", "curr", "employee", "shipvia", "open", - "closed"); + "closed", "delivered"); $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); + $form->{"l_delivered"} = "Y" + if ($form->{"delivered"} && $form->{"notdelivered"}); + foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { push @column_index, $item; @@ -1618,7 +1629,9 @@ sub orders { . qq||; $column_header{quonumber} = qq||; $column_header{name} = qq||; @@ -1638,6 +1651,8 @@ sub orders { qq||; $column_header{closed} = qq||; + $column_header{"delivered"} = + qq||; $column_header{employee} = qq||; @@ -1765,6 +1780,9 @@ sub orders { $column_data{closed} = ""; $column_data{open} = ""; } + $column_data{"delivered"} = ""; $i++; $i %= 2; @@ -1851,11 +1869,6 @@ sub orders { . $locale->text('Add') . qq|">|; } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print qq| @@ -2127,10 +2140,12 @@ sub invoice { # also copy deliverydate from the order $form->{deliverydate} = $form->{reqdate} if $form->{reqdate}; + $form->{orddate} = $form->{transdate}; } else { $form->isblank("quonumber", $locale->text('Quotation Number missing!')); $form->isblank("transdate", $locale->text('Quotation Date missing!')); $form->{ordnumber} = ""; + $form->{quodate} = $form->{transdate}; } # if the name changed get new values @@ -2141,6 +2156,13 @@ sub invoice { $form->{cp_id} *= 1; + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + if ( $form->{type} =~ /_order/ && $form->{currency} ne $form->{defaultcurrency}) { @@ -2165,8 +2187,7 @@ sub invoice { # if not it's most likely a collective order, which can't be saved back # so they just have to be closed if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) { - relink_accounts(); - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form); } else { OE->close_orders(\%myconfig, \%$form); } @@ -2432,9 +2453,7 @@ sub purchase_order { if ( $form->{type} eq 'sales_quotation' || $form->{type} eq 'request_quotation') { - $form->{closed} = 1; - relink_accounts(); - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form); } $form->{cp_id} *= 1; @@ -2840,14 +2859,6 @@ sub display_ship_receive { -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| {rowcount}> @@ -3119,14 +3130,8 @@ sub list_transfer { {password}> |; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + . $locale->text('Transfer') . qq|"> - print qq|
| . $locale->text('ID') . qq|| - . $locale->text('Quotation') + . ($form->{"type"} eq "request_quotation" ? + $locale->text('RFQ') : + $locale->text('Quotation')) . qq|$name| . $locale->text('O') . qq|| . $locale->text('C') . qq|| . $locale->text("Delivered") . qq|$employee X" . + ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) . + "