X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=c814826d052f5e02877a6fb676489bbeb6520152;hb=036fe04d0f9d0ccfc7ef563530d3c118986ef0ca;hp=10e71ac17ae2e3365e226536d55f492c3462607d;hpb=f16abae9524dc7ffd6c40bc37784791883e29739;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 10e71ac17..c814826d0 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -110,6 +110,9 @@ sub add { sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button $form->{simple_save} = 0; @@ -205,7 +208,7 @@ sub order_links { $intnotes = $form->{intnotes}; # get customer / vendor - if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) { + if ($form->{type} =~ /(purchase_order|request_quotation)/) { IR->get_vendor(\%myconfig, \%$form); #quote all_vendor Bug 133 @@ -214,7 +217,7 @@ sub order_links { } } - if ($form->{type} =~ /(sales|ship)_(order|quotation)/) { + if ($form->{type} =~ /sales_(order|quotation)/) { IS->get_customer(\%myconfig, \%$form); #quote all_vendor Bug 133 @@ -407,54 +410,51 @@ sub form_header { #quote select[customer|vendor] Bug 133 $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); - #build contacts - if ($form->{all_contacts}) { + my @old_project_ids = ($form->{"globalproject_id"}); + map({ push(@old_project_ids, $form->{"project_id_$_"}) + if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); - $form->{selectcontact} = ""; - foreach $item (@{ $form->{all_contacts} }) { - my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : ""; - if ($form->{cp_id} == $item->{cp_id}) { - $form->{selectcontact} .= - ""; - } else { - $form->{selectcontact} .= ""; - } - } - } else { - $form->{selectcontact} =~ s/ selected//g; - if ($form->{cp_id} ne "") { - $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/; - } - } + $form->get_lists("contacts" => "ALL_CONTACTS", + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }); + my (%labels, @values); + foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { + push(@values, $item->{"cp_id"}); + $labels{$item->{"cp_id"}} = $item->{"cp_name"} . + ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); + } + my $contact = + NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, + '-labels' => \%labels, '-default' => $form->{"cp_id"})); - if (@{ $form->{SHIPTO} }) { - $form->{selectshipto} = ""; - foreach $item (@{ $form->{SHIPTO} }) { - if ($item->{shipto_id} == $form->{shipto_id}) { - $form->{selectshipto} .= - ""; - } 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/; - } + %labels = (); + @values = (""); + foreach my $item (@{ $form->{"ALL_SHIPTO"} }) { + push(@values, $item->{"shipto_id"}); + $labels{$item->{"shipto_id"}} = + $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"}; } - $shipto = qq| + my $shipto = qq|
+ | ++ | +||||||||||
@@ -1482,6 +1455,7 @@ sub search { | $employee | | . $locale->text('Ship via') . qq| | +$employee | ||||||||
| @@ -1490,6 +1464,8 @@ sub search { . $locale->text('Tax') . qq| | | . $locale->text('Total') . qq| | +| + . $locale->text('Project Number') . qq| | |||||||||
| @@ -1539,26 +1515,24 @@ sub orders { $number = $form->escape($form->{$ordnumber}); $name = $form->escape($form->{ $form->{vc} }); $department = $form->escape($form->{department}); - $warehouse = $form->escape($form->{warehouse}); # 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&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"; # construct callback $number = $form->escape($form->{$ordnumber}, 1); $name = $form->escape($form->{ $form->{vc} }, 1); $department = $form->escape($form->{department}, 1); - $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}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$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"; @columns = $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", "name", "netamount", "tax", "amount", - "curr", "employee", "shipvia", "open", - "closed", "delivered"); + "curr", "employee", "shipvia", "globalprojectnumber", + "open", "closed", "delivered"); $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); @@ -1587,9 +1561,7 @@ sub orders { } if ($form->{vc} eq 'vendor') { - if ($form->{type} eq 'receive_order') { - $form->{title} = $locale->text('Receive Merchandise'); - } elsif ($form->{type} eq 'purchase_order') { + if ($form->{type} eq 'purchase_order') { $form->{title} = $locale->text('Purchase Orders'); } else { $form->{title} = $locale->text('Request for Quotations'); @@ -1601,9 +1573,6 @@ sub orders { if ($form->{type} eq 'sales_order') { $form->{title} = $locale->text('Sales Orders'); $employee = $locale->text('Salesperson'); - } elsif ($form->{type} eq 'ship_order') { - $form->{title} = $locale->text('Ship Merchandise'); - $employee = $locale->text('Salesperson'); } else { $form->{title} = $locale->text('Quotations'); $employee = $locale->text('Employee'); @@ -1647,6 +1616,8 @@ sub orders { qq| | | . $locale->text('Ship via') . qq| | |; + $column_header{globalprojectnumber} = + qq|| . $locale->text('Project Number') . qq| | |; $column_header{open} = qq|| . $locale->text('O') . qq| | |; $column_header{closed} = @@ -1663,12 +1634,6 @@ sub orders { $option = $locale->text(ucfirst $form->{vc}); $option .= " : $form->{$form->{vc}}"; } - if ($form->{warehouse}) { - ($warehouse) = split /--/, $form->{warehouse}; - $option .= "\n$oe->{reqdate} | "; $column_data{$ordnumber} = - "{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber} | "; + "{path}&action=$action&type=$form->{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} | "; $column_data{shipvia} = "$oe->{shipvia} | "; + $column_data{globalprojectnumber} = "" . H($oe->{globalprojectnumber}) . " | "; if ($oe->{closed}) { $column_data{closed} = "X | "; @@ -1839,7 +1802,6 @@ sub orders { . $locale->text('Continue') . qq|"> - @@ -1861,15 +1823,7 @@ sub orders { {path}> {login}> {password}> -|; - if ($form->{type} !~ /(ship|receive)_order/) { - print qq| -|; - } - - print qq|
---|