X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=254a23bf3ba977a2e939e1265897a03f2e7b3b7b;hb=71196b75e9beb984ead25c605ab91443269de88d;hp=e2fb8a2aaeada8b5f6363e9ef7614d59c037a998;hpb=59f8f1fad78635c084328f8bf726f107cbb5bba2;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index e2fb8a2aa..254a23bf3 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; @@ -117,19 +120,19 @@ sub edit { # editing without stuff to edit? try adding it first if ($form->{rowcount}) { - map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount}); + map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount}); if (!$id) { # reset rowcount undef $form->{rowcount}; &add; + $lxdebug->leave_sub(); return; } - } else { - if (!$form->{id}) { - &add; - return; - } + } elsif (!$form->{id}) { + &add; + $lxdebug->leave_sub(); + return; } if ($form->{print_and_save}) { @@ -164,6 +167,8 @@ sub order_links { # set jscalendar $form->{jscalendar} = $jscalendar; + my $editing = $form->{id}; + OE->retrieve(\%myconfig, \%$form); if ($form->{payment_id}) { @@ -176,6 +181,8 @@ sub order_links { $taxzone_id = $form->{taxzone_id}; } + $salesman_id = $form->{salesman_id} if ($editing); + # if multiple rowcounts (== collective order) then check if the # there were more than one customer (in that case OE::retrieve removes @@ -233,7 +240,7 @@ sub order_links { if ($taxzone_id) { $form->{taxzone_id} = $taxzone_id; } - $form->{intnotes} = $intnotes; + $form->{intnotes} = $intnotes if $intnotes; ($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} }; $form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; @@ -279,6 +286,8 @@ sub order_links { # forex $form->{forex} = $form->{exchangerate}; + $form->{salesman_id} = $salesman_id if ($editing); + $lxdebug->leave_sub(); } @@ -407,11 +416,16 @@ sub form_header { #quote select[customer|vendor] Bug 133 $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); + my @old_project_ids = ($form->{"globalproject_id"}); + map({ push(@old_project_ids, $form->{"project_id_$_"}) + if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); + $form->get_lists("contacts" => "ALL_CONTACTS", "shipto" => "ALL_SHIPTO", "projects" => { "key" => "ALL_PROJECTS", "all" => 0, - "old_id" => $form->{"globalproject_id"} }); + "old_id" => \@old_project_ids }, + "employees" => "ALL_SALESMEN"); my (%labels, @values); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { @@ -420,8 +434,8 @@ sub form_header { ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); } my $contact = - $cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, - '-labels' => \%labels, '-default' => $form->{"cp_id"}); + NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, + '-labels' => \%labels, '-default' => $form->{"cp_id"})); %labels = (); @values = (""); @@ -431,6 +445,13 @@ sub form_header { $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"}; } + my $shipto = qq| + | . $locale->text('Shipping Address') . qq| + | . + NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, + '-labels' => \%labels, '-default' => $form->{"shipto_id"})) + . qq||; + %labels = (); @values = (""); foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { @@ -438,16 +459,28 @@ sub form_header { $labels{$item->{"id"}} = $item->{"projectnumber"}; } my $globalprojectnumber = - $cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, - '-labels' => \%labels, - '-default' => $form->{"globalproject_id"}); + NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, + '-labels' => \%labels, + '-default' => $form->{"globalproject_id"})); + + $salesman = ""; + if ($form->{type} =~ /^sales_/) { + %labels = (); + @values = (""); + foreach my $item (@{ $form->{ALL_SALESMEN} }) { + push(@values, $item->{id}); + $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login}; + } - my $shipto = qq| - | . $locale->text('Shipping Address') . qq| - | . - $cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, - '-labels' => \%labels, '-default' => $form->{"shipto_id"}) - . qq||; + $salesman = + qq| + | . $locale->text('Salesman') . qq| + | . + NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id}, + '-values' => \@values, '-labels' => \%labels)) + . qq| + |; + } $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); @@ -658,7 +691,7 @@ sub form_header { $employee = qq| {customer_klass}> - | . $locale->text('Salesperson') . qq| + | . $locale->text('Employee') . qq| @@ -691,7 +724,9 @@ sub form_header { } $form->{"javascript"} .= qq||; - + # show history button js + $form->{javascript} .= qq||; + #/show history button js $form->header; print qq| @@ -794,6 +829,7 @@ print qq| $openclosed $employee + $salesman $ordnumber @@ -884,7 +920,8 @@ sub form_footer { $tax .= qq| - + |; @@ -923,7 +960,8 @@ sub form_footer { $tax .= qq| - + @@ -1041,6 +1079,12 @@ sub form_footer { if (($form->{id})) { print qq| + +
| . $locale->text("Workflow $form->{type}") . qq|
@@ -1098,6 +1142,8 @@ sub form_footer { |; } + $form->hide_form("saved_xyznumber"); + print qq| {rowcount}> @@ -1127,8 +1173,6 @@ sub update { &check_name($form->{vc}); - &check_project; - $buysell = 'buy'; $buysell = 'sell' if ($form->{vc} eq 'vendor'); $form->{exchangerate} = $exchangerate @@ -1280,7 +1324,7 @@ sub search { $form->{vc} = 'customer'; $ordlabel = $locale->text('Order Number'); $ordnumber = 'ordnumber'; - $employee = $locale->text('Salesperson'); + $employee = $locale->text('Employee'); } if ($form->{type} eq 'sales_quotation') { @@ -1326,10 +1370,6 @@ sub search { | if $form->{selectdepartment}; - $openclosed = qq| - -|; - my $delivered; if (($form->{"type"} eq "sales_order") || ($form->{"type"} eq "purchase_order")) { @@ -1373,6 +1413,19 @@ sub search { |; } + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }); + + my %labels = (); + my @values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"projectnumber"}; + } + my $projectnumber = + NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values, + '-labels' => \%labels)); + $form->header; print qq| @@ -1397,6 +1450,10 @@ sub search { + + + + $button1 @@ -1408,7 +1465,12 @@ sub search {
| . $locale->text('Project Number') . qq|
$form->{"${item}_description"}$form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"}
Enthaltene $form->{"${item}_description"}Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"}
$ordlabel
| . $locale->text("Project Number") . qq|$projectnumber
| . $locale->text('From') . qq|| . $locale->text('Include in Report') . qq| - $openclosed + + + + $delivered + + |; + $column_header{globalprojectnumber} = + qq||; $column_header{open} = qq||; $column_header{closed} = @@ -1687,7 +1753,7 @@ sub orders { $subtotalamount += $oe->{amount}; $column_data{ids} = - qq||; + qq||; $column_data{id} = ""; $column_data{transdate} = ""; $column_data{reqdate} = ""; @@ -1698,6 +1764,7 @@ sub orders { $column_data{employee} = ""; $column_data{shipvia} = ""; + $column_data{globalprojectnumber} = ""; if ($oe->{closed}) { $column_data{closed} = ""; @@ -1897,10 +1964,17 @@ sub save_and_close { relink_accounts(); - $form->redirect( - $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!')) - if (OE->save(\%myconfig, \%$form)); - $form->error($err); + $form->error($err) if (!OE->save(\%myconfig, \%$form)); + + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + + $form->redirect($form->{label} . " $form->{$ordnumber} " . + $locale->text('saved!')); $lxdebug->leave_sub(); } @@ -1972,6 +2046,14 @@ sub save { relink_accounts(); OE->save(\%myconfig, \%$form); + + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->{simple_save} = 1; if(!$form->{print_and_save}) { set_headings("edit"); @@ -2034,8 +2116,15 @@ sub yes { $msg = $locale->text('Quotation deleted!'); $err = $locale->text('Cannot delete quotation!'); } - - $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool)); + if (OE->delete(\%myconfig, \%$form, $spool)){ + $form->redirect($msg); + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + } $form->error($err); $lxdebug->leave_sub(); @@ -2049,11 +2138,9 @@ sub invoice { # these checks only apply if the items don't bring their own ordnumbers/transdates. # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields. $form->isblank("ordnumber", $locale->text('Order Number missing!')) - if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); $form->isblank("transdate", $locale->text('Order Date missing!')) - if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); # also copy deliverydate from the order $form->{deliverydate} = $form->{reqdate} if $form->{reqdate}; @@ -2358,7 +2445,15 @@ sub save_as_new { $form->{saveasnew} = 1; $form->{closed} = 0; - map { delete $form->{$_} } qw(printed emailed queued ordnumber quonumber); + map { delete $form->{$_} } qw(printed emailed queued); + + # Let Lx-Office assign a new order number if the user hasn't changed the + # previous one. If it has been changed manually then use it as-is. + my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; + if ($form->{saved_xyznumber} && + ($form->{saved_xyznumber} eq $form->{$idx})) { + delete($form->{$idx}); + } &save; @@ -2440,3 +2535,26 @@ sub poso { $lxdebug->leave_sub(); } +sub e_mail { + $lxdebug->enter_sub(); + + $form->{saveasnew} = 1; + $form->{closed} = 0; + $form->{print_and_save} = 1; + map { delete $form->{$_} } qw(printed emailed queued); + + # Let Lx-Office assign a new order number if the user hasn't changed the + # previous one. If it has been changed manually then use it as-is. + my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; + if ($form->{saved_xyznumber} && + ($form->{saved_xyznumber} eq $form->{$idx})) { + delete($form->{$idx}); + } + + &save; + + &edit_e_mail; + + $lxdebug->leave_sub(); +} +
+ +
@@ -1424,6 +1486,7 @@ sub search { $employee | . $locale->text('Ship via') . qq| $employee
| @@ -1432,6 +1495,8 @@ sub search { . $locale->text('Tax') . qq| | . $locale->text('Total') . qq| | + . $locale->text('Project Number') . qq|
| @@ -1497,8 +1562,8 @@ sub orders { @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}); @@ -1538,11 +1603,10 @@ sub orders { if ($form->{vc} eq 'customer') { if ($form->{type} eq 'sales_order') { $form->{title} = $locale->text('Sales Orders'); - $employee = $locale->text('Salesperson'); } else { $form->{title} = $locale->text('Quotations'); - $employee = $locale->text('Employee'); } + $employee = $locale->text('Employee'); $name = $locale->text('Customer'); } @@ -1582,6 +1646,8 @@ sub orders { qq|| . $locale->text('Ship via') . qq|| . $locale->text('Project Number') . qq|| . $locale->text('O') . qq|$oe->{id}$oe->{transdate} $oe->{reqdate} $oe->{employee} $oe->{shipvia} " . H($oe->{globalprojectnumber}) . "X