X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=3bc2211a36ec10d244106d5555d8f806685d4b81;hb=9fd46de37d7906b7c104c17112b34bae7d534d67;hp=0d0d8013151aa51f7159b0c38921bb616e510e48;hpb=e07e9534d0c611913e31bc620c65e46701e5f000;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 0d0d80131..3bc2211a3 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; @@ -407,8 +410,15 @@ 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"); + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }); my (%labels, @values); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { @@ -417,8 +427,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,10 +441,21 @@ sub form_header { my $shipto = qq|
+ | ++ | +||||||
@@ -1406,6 +1455,7 @@ sub search { | $employee | | . $locale->text('Ship via') . qq| | +$employee | ||||
| @@ -1414,6 +1464,8 @@ sub search { . $locale->text('Tax') . qq| | | . $locale->text('Total') . qq| | +| + . $locale->text('Project Number') . qq| | |||||
| @@ -1479,8 +1531,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}); @@ -1564,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} = @@ -1680,6 +1734,7 @@ sub orders { $column_data{employee} = "$oe->{employee} | "; $column_data{shipvia} = "$oe->{shipvia} | "; + $column_data{globalprojectnumber} = "" . H($oe->{globalprojectnumber}) . " | "; if ($oe->{closed}) { $column_data{closed} = "X | "; @@ -1879,10 +1934,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(); } @@ -1954,6 +2016,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"); @@ -2016,8 +2086,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();
---|