X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=cd5eda594559e1d03bd1e59df99ab554109dab0e;hb=87c7db6a14d2276b72c85a8423e3995f20255b6a;hp=a18c638a74e6d25a6d2346f7378369d724314fbe;hpb=2387a1fccb259789836aa1a9da44528be4d63bec;p=kivitendo-erp.git

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index a18c638a7..cd5eda594 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -36,6 +36,8 @@ use SL::IR;
 use SL::PE;
 
 require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/drafts.pl";
 
 1;
 
@@ -72,14 +74,18 @@ require "$form->{path}/arap.pl";
 sub add {
   $lxdebug->enter_sub();
 
+  return $lxdebug->leave_sub() if (load_draft_maybe());
+
   $form->{title} = "Add";
 
   $form->{callback} =
     "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
-  &create_links;
   AP->get_transdate(\%myconfig, $form);
+  $form->{initial_transdate} = $form->{transdate};
+  &create_links;
+  $form->{transdate} = $form->{initial_transdate};
   &display_form;
 
   $lxdebug->leave_sub();
@@ -87,6 +93,9 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
 
   $form->{title} = "Edit";
 
@@ -121,13 +130,8 @@ sub create_links {
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
 
-  map {
-    $tax .=
-      qq|<option value=\"$_->{id}--$_->{rate}\">$_->{taxdescription}  |
-      . ($_->{rate} * 100) . qq| %|
-  } @{ $form->{TAX} };
-  $form->{taxchart}       = $tax;
-  $form->{selecttaxchart} = $tax;
+  # notes
+  $form->{notes} = $form->{intnotes} unless $form->{notes};
 
   # currencies
   @curr = split(/:/, $form->{currencies});
@@ -192,6 +196,7 @@ sub create_links {
         $form->{"forex_$j"} = $form->{"exchangerate_$i"} =
           $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
         $form->{"AP_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
+        $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
         $form->{paidaccounts}++;
       } else {
 
@@ -209,8 +214,6 @@ sub create_links {
           if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
             $totaltax +=
               $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
-            $taxrate +=
-              $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
           } else {
             $totalwithholding +=
               $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
@@ -244,11 +247,15 @@ sub create_links {
           $form->{"select${key}"} =~
             /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/;
           $form->{"${key}_$k"} = $1;
-          if ($akey eq 'amount') {
-            $form->{"taxchart_$k"} = $form->{taxchart};
-            $form->{"taxchart_$k"} =~
-              /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{id}--[^\"]*)/;
-            $form->{"taxchart_$k"} = $1;
+
+          if ($akey eq "AP") {
+            $form->{APselected} = $form->{acc_trans}{$key}->[$i-1]->{accno};
+
+          } elsif ($akey eq 'amount') {
+            $form->{"${key}_$k"} = $form->{acc_trans}{$key}->[$i-1]->{accno} .
+              "--" . $form->{acc_trans}{$key}->[$i-1]->{id};
+            $form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id} .
+              "--" . $form->{acc_trans}{$key}->[$i-1]->{rate};
           }
         }
       }
@@ -324,10 +331,6 @@ sub form_header {
   $form->{radier} =
     ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
   $readonly                 = ($form->{radier}) ? "" : $readonly;
-  $selectAP_amount_unquoted = $form->{selectAP_amount};
-  $taxchart                 = $form->{taxchart};
-  map { $form->{$_} =~ s/\"/&quot;/g }
-    qw(AP_amount selectAP_amount AP taxchart);
 
   # format amounts
   $form->{exchangerate} =
@@ -386,9 +389,71 @@ sub form_header {
 
   $vendor =
     ($form->{selectvendor})
-    ? qq|<select name=vendor>$form->{selectvendor}</select>|
+    ? qq|<select name="vendor"
+onchange="document.getElementById('update_button').click();">$form->{
+selectvendor } </select>|
     : qq|<input name=vendor value="$form->{vendor}" size=35>|;
 
+  my @old_project_ids = ();
+  map({ push(@old_project_ids, $form->{"project_id_$_"})
+          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 0,
+                                   "old_id" => \@old_project_ids },
+                   "charts" => { "key" => "ALL_CHARTS",
+                                 "transdate" => $form->{transdate} },
+                   "taxcharts" => "ALL_TAXCHARTS");
+
+  map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
+      @{ $form->{ALL_CHARTS} });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my (%AP_amount_labels, @AP_amount_values);
+  my (%AP_labels, @AP_values);
+  my (%AP_paid_labels, @AP_paid_values);
+  my %charts;
+  my $taxchart_init;
+
+  foreach my $item (@{ $form->{ALL_CHARTS} }) {
+    if (grep({ $_ eq "AP_amount" } @{ $item->{link_split} })) {
+      $taxchart_init = $item->{tax_id} if ($taxchart_init eq "");
+      my $key = "$item->{accno}--$item->{tax_id}";
+      push(@AP_amount_values, $key);
+      $AP_amount_labels{$key} =
+        "$item->{accno}--$item->{description}";
+
+    } elsif (grep({ $_ eq "AP" } @{ $item->{link_split} })) {
+      push(@AP_values, $item->{accno});
+      $AP_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
+
+    } elsif (grep({ $_ eq "AP_paid" } @{ $item->{link_split} })) {
+      push(@AP_paid_values, $item->{accno});
+      $AP_paid_labels{$item->{accno}} =
+        "$item->{accno}--$item->{description}";
+    }
+
+    $charts{$item->{accno}} = $item;
+  }
+
+  my %taxchart_labels = ();
+  my @taxchart_values = ();
+  my %taxcharts = ();
+  foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
+    my $key = "$item->{id}--$item->{rate}";
+    $taxchart_init = $key if ($taxchart_init eq $item->{id});
+    push(@taxchart_values, $key);
+    $taxchart_labels{$key} =
+      "$item->{taxdescription} " . ($item->{rate} * 100) . ' %';
+    $taxcharts{$item->{id}} = $item;
+  }
+
   # use JavaScript Calendar or not
   $form->{jsscript} = $jscalendar;
   $jsscript = "";
@@ -432,6 +497,8 @@ sub form_header {
 <input type=hidden name=locked value=$form->{locked}>
 <input type=hidden name=title value="$title">
 
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
+
 <table width=100%>
   <tr class=listtop>
     <th class=listtop>$form->{title}</th>
@@ -506,9 +573,6 @@ sub form_header {
 
 
 $jsscript
-  <input type=hidden name=selectAP_amount value="$form->{selectAP_amount}">
-  <input type=hidden name=AP_amount value="$form->{AP_amount}">
-  <input type=hidden name=taxchart value="$form->{taxchart}">
   <input type=hidden name=rowcount value=$form->{rowcount}>
   <tr>
       <td>
@@ -538,28 +602,61 @@ $jsscript
     $form->{"amount_$i"} =
       $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
     $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
-    $selectAP_amount = $selectAP_amount_unquoted;
-    $re_amount = quotemeta($form->{"AP_amount_$i"});
-    $selectAP_amount =~
-      s/option value=\"${re_amount}\"/option value=\"$form->{"AP_amount_$i"}\" selected/;
-    $tax          = $taxchart;
-    $tax_selected = $form->{"taxchart_$i"};
-    $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
-    $tax =
-      qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px">$tax</select></td>|;
+
+    my $selected_accno_full;
+    my ($accno_row) = split(/--/, $form->{"AP_amount_$i"});
+    my $item = $charts{$accno_row};
+    $selected_accno_full = "$item->{accno}--$item->{tax_id}";
+
+    my $selected_taxchart = $form->{"taxchart_$i"};
+    my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full);
+    my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_AP_amount_$i"});
+
+    if ($previous_accno &&
+        ($previous_accno eq $selected_accno) &&
+        ($previous_tax_id ne $selected_tax_id)) {
+      my $item = $taxcharts{$selected_tax_id};
+      $selected_taxchart = "$item->{id}--$item->{rate}";
+    }
+
+    $selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
+
+    $selectAP_amount =
+      NTI($cgi->popup_menu('-name' => "AP_amount_$i",
+                           '-id' => "AP_amount_$i",
+                           '-style' => 'width:400px',
+                           '-onChange' => "setTaxkey(this, $i)",
+                           '-values' => \@AP_amount_values,
+                           '-labels' => \%AP_amount_labels,
+                           '-default' => $selected_accno_full))
+      . $cgi->hidden('-name' => "previous_AP_amount_$i",
+                     '-default' => $selected_accno_full);
+
+    $tax = qq|<td>| .
+      NTI($cgi->popup_menu('-name' => "taxchart_$i",
+                           '-id' => "taxchart_$i",
+                           '-style' => 'width:200px',
+                           '-values' => \@taxchart_values,
+                           '-labels' => \%taxchart_labels,
+                           '-default' => $selected_taxchart))
+      . qq|</td>|;
 
     my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
 
+    my $projectnumber =
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@project_values,
+                           '-labels' => \%project_labels,
+                           '-default' => $form->{"project_id_$i"} ));
+
     print qq|
 	<tr>
-          <td width=50%><select name="AP_amount_$i" onChange="setTaxkey(this, $i)" style="width:100%">$selectAP_amount</select></td>
+          <td>$selectAP_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
           <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
           <td><input type="checkbox" name="korrektur_$i" value="1" "$korrektur"></td>
           $tax
-	  <td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
-	      <input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
-	      <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}"></td>
+          <td>$projectnumber</td>
 	</tr>
 |;
     $amount  = "";
@@ -573,6 +670,11 @@ $jsscript
 
   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
+  $APselected =
+    NTI($cgi->popup_menu('-name' => "APselected", '-id' => "APselected",
+                         '-style' => 'width:400px',
+                         '-values' => \@AP_values, '-labels' => \%AP_labels,
+                         '-default' => $form->{APselected}));
   print qq|
         <tr>
           <td colspan=6>
@@ -580,8 +682,7 @@ $jsscript
           </td>
         </tr>
         <tr>
-	  <td><select name=APselected>$form->{selectAP}</select></td>
-          <input type=hidden name=AP value="$form->{AP}">
+	  <td>${APselected}</td>
 	  <th align=left>$form->{invtotal}</th>
 
 	  <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
@@ -610,14 +711,14 @@ $jsscript
     <td>
       <table width=100%>
 	<tr class=listheading>
-	  <th class=listheading colspan=6>| . $locale->text('Payments') . qq|</th>
+	  <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
 	</tr>
 |;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
-    @column_index = qw(datepaid source memo paid AP_paid);
+    @column_index = qw(datepaid source memo paid AP_paid paid_project_id);
   } else {
-    @column_index = qw(datepaid source memo paid exchangerate AP_paid);
+    @column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id);
   }
 
   $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
@@ -626,6 +727,7 @@ $jsscript
   $column_data{AP_paid}      = "<th>" . $locale->text('Account') . "</th>";
   $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
   $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
+  $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>"; 
 
   print "
         <tr>
@@ -635,15 +737,19 @@ $jsscript
         </tr>
 ";
 
+  my @triggers = ();
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
     print "
         <tr>
 ";
 
-    $form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
-    $form->{"selectAP_paid_$i"} =~
-      s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
+    $selectAP_paid =
+      NTI($cgi->popup_menu('-name' => "AP_paid_$i",
+                           '-id' => "AP_paid_$i",
+                           '-values' => \@AP_paid_values,
+                           '-labels' => \%AP_paid_labels,
+                           '-default' => $form->{"AP_paid_$i"}));
 
     # format amounts
     if ($form->{"paid_$i"}) {
@@ -671,25 +777,33 @@ $jsscript
     $column_data{"paid_$i"} =
       qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
     $column_data{"AP_paid_$i"} =
-      qq|<td align=center><select name="AP_paid_$i">$form->{"selectAP_paid_$i"}</select></td>|;
+      qq|<td align=center>${selectAP_paid}</td>|;
     $column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
     $column_data{"datepaid_$i"}     =
-      qq|<td align=center><input name="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}></td>|;
+      qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}>
+         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
     $column_data{"source_$i"} =
       qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
     $column_data{"memo_$i"} =
       qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+    $column_data{"paid_project_id_$i"} =
+      qq|<td>|
+      . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+                             '-values' => \@project_values,
+                             '-labels' => \%project_labels,
+                             '-default' => $form->{"paid_project_id_$i"} ))
+      . qq|</td>|;
 
     map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
 
     print "
         </tr>
 ";
+    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
-  map { $form->{$_} =~ s/\"/&quot;/g } qw(selectAP_paid);
-  print qq|
+  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+    qq|
     <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
-    <input type=hidden name=selectAP_paid value="$form->{selectAP_paid}">
 
       </table>
     </td>
@@ -709,49 +823,70 @@ sub form_footer {
   print qq|
 
 <input name=callback type=hidden value="$form->{callback}">
+<input name="gldate" type="hidden" value="| . Q($form->{gldate}) . qq|">
 
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
 
 <br>
 |;
 
+  if (!$form->{id} && $form->{draft_id}) {
+    print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
+                             '-value' => 1, '-checked' => $form->{remove_draft},
+                             '-label' => '')) .
+          qq|&nbsp;<label for="remove_draft">| .
+          $locale->text("Remove draft when posting") .
+          qq|</label><br>|);
+  }
+
   $transdate = $form->datetonum($form->{transdate}, \%myconfig);
   $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
+  print qq|<input class="submit" type="submit" name="action" id="update_button" value="|
+    . $locale->text('Update') . qq|">|;
+
   if ($form->{id}) {
 
     #     print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
     # |;
-  if ($form->{radier}) {
-        print qq|
+    if ($form->{radier}) {
+      print qq|
 	<input class=submit type=submit name=action value="|
           . $locale->text('Post') . qq|">
 	<input class=submit type=submit name=action value="|
           . $locale->text('Delete') . qq|">
 |;
-  }
+    }
 
-      print qq|
+    print qq|
 <input class=submit type=submit name=action value="|
         . $locale->text('Use As Template') . qq|">
+<input class=submit type=submit name=action value="|
+        . $locale->text('Post Payment') . qq|">
 |;
- 
-  } else {
-    if (($transdate > $closedto) && !$form->{id}) {
-      print qq|<input class=submit type=submit name=action value="|
-        . $locale->text('Update') . qq|">
+  } elsif (($transdate > $closedto) && !$form->{id}) {
+    print qq|
       <input class=submit type=submit name=action value="|
-        . $locale->text('Post') . qq|">|;
-    }
+      . $locale->text('Post') . qq|"> | .
+      NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+                       '-class' => 'submit'));
   }
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+  # button for saving history
+  if($form->{id} ne "") {
+    print qq|
+  	  <input type=button class=submit onclick=set_history_window(|
+  	  . $form->{id} 
+  	  . qq|); name=history id=history value=|
+  	  . $locale->text('history') 
+  	  . qq|>|;
   }
-
+  # /button for saving history
   print "
 </form>
 
@@ -767,28 +902,8 @@ sub update {
 
   my $display = shift;
 
-  #   if ($display) {
-  #     goto TAXCALC;
-  #   }
-
   $form->{invtotal} = 0;
 
-  #   $form->{selectAP_amount} = $form->{AP_amount};
-  #   $form->{selectAP_amount} =~
-  #     s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
-
-  $form->{selectAP} = $form->{AP};
-  $form->{selectAP} =~
-    s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
-
-  ($AP_amountaccno, $AP_amounttaxkey) =
-    split(/--/, $form->{AP_amountselected});
-  $form->{selecttaxchart} = $form->{taxchart};
-  $form->{selecttaxchart} =~
-    s/value=\"$AP_amounttaxkey--([^\"]*)\"/value=\"$AP_amounttaxkey--$1\" selected/;
-
-  $form->{rate} = $1;
-
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
 
@@ -837,7 +952,6 @@ sub update {
   &check_name(vendor);
   $form->{AP} = $save_AP;
 
-  &check_project;
   $form->{rowcount} = $count + 1;
 
   $form->{invtotal} =
@@ -873,6 +987,38 @@ sub update {
   $lxdebug->leave_sub();
 }
 
+
+sub post_payment {
+  $lxdebug->enter_sub();
+  for $i (1 .. $form->{paidaccounts}) {
+    if ($form->{"paid_$i"}) {
+      $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+
+      $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+
+      $form->error($locale->text('Cannot post payment for a closed period!'))
+        if ($datepaid <= $closedto);
+
+      if ($form->{currency} ne $form->{defaultcurrency}) {
+        $form->{"exchangerate_$i"} = $form->{exchangerate}
+          if ($invdate == $datepaid);
+        $form->isblank("exchangerate_$i",
+                       $locale->text('Exchangerate for payment missing!'));
+      }
+    }
+  }
+
+  ($form->{AP})      = split /--/, $form->{AP};
+  ($form->{AP_paid}) = split /--/, $form->{AP_paid};
+  $form->redirect($locale->text(' Payment posted!'))
+      if (AP->post_payment(\%myconfig, \%$form));
+    $form->error($locale->text('Cannot post payment!'));
+
+
+  $lxdebug->leave_sub();
+}
+
+
 sub post {
   $lxdebug->enter_sub();
 
@@ -925,8 +1071,16 @@ sub post {
 
   $form->{id} = 0 if $form->{postasnew};
 
-  $form->redirect($locale->text('Transaction posted!'))
-    if (AP->post_transaction(\%myconfig, \%$form));
+  if (AP->post_transaction(\%myconfig, \%$form)) {
+    # saving the history
+    if(!exists $form->{addition} && $form->{id} ne "") {
+      $form->{addition} = "POSTED";
+      $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+    remove_draft() if $form->{remove_draft};
+    $form->redirect($locale->text('Transaction posted!'));
+  }
   $form->error($locale->text('Cannot post transaction!'));
 
   $lxdebug->leave_sub();
@@ -936,6 +1090,12 @@ sub post_as_new {
   $lxdebug->enter_sub();
 
   $form->{postasnew} = 1;
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+  	$form->{addition} = "POSTED AS NEW";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   &post;
 
   $lxdebug->leave_sub();
@@ -993,9 +1153,15 @@ sub delete {
 
 sub yes {
   $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Transaction deleted!'))
-    if (AP->delete_transaction(\%myconfig, \%$form, $spool));
+  if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
+    # saving the history
+    if(!exists $form->{addition}) {
+  	  $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+    $form->redirect($locale->text('Transaction deleted!'));
+  }
   $form->error($locale->text('Cannot delete transaction!'));
 
   $lxdebug->leave_sub();
@@ -1064,6 +1230,19 @@ sub search {
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
   }
 
+  $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|
@@ -1096,6 +1275,10 @@ sub search {
 	  <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
 	  <td colspan=3><input name=notes size=40></td>
 	</tr>
+        <tr>
+          <th align="right">| . $locale->text("Project Number") . qq|</th>
+          <td colspan="3">$projectnumber</td>
+        </tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('From') . qq|</th>
 	  $button1
@@ -1160,6 +1343,8 @@ sub search {
 	      <tr>
 		<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
 		<td nowrap>| . $locale->text('Subtotal') . qq|</td>
+		<td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+		<td nowrap>| . $locale->text('Project Number') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -1262,10 +1447,14 @@ sub ap_transactions {
     $option   .= "\n<br>" if ($option);
     $option   .= $locale->text('Closed');
   }
+  if ($form->{globalproject_id}) {
+    $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+    $href     .= "&globalproject_id=" . E($form->{globalproject_id});
+  }
 
-  @columns = $form->sort_columns(
-    qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee)
-  );
+  @columns =
+    qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+       due duedate notes employee globalprojectnumber);
 
   foreach $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
@@ -1325,6 +1514,8 @@ sub ap_transactions {
   $column_header{employee} =
     "<th><a class=listheading href=$href&sort=employee>"
     . $locale->text('Employee') . "</th>";
+  $column_header{globalprojectnumber} =
+    qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
 
   $form->{title} = $locale->text('AP Transactions');
 
@@ -1415,6 +1606,8 @@ sub ap_transactions {
     $ap->{notes} =~ s/\r\n/<br>/g;
     $column_data{notes}    = "<td>$ap->{notes}&nbsp;</td>";
     $column_data{employee} = "<td>$ap->{employee}&nbsp;</td>";
+    $column_data{globalprojectnumber}  =
+      "<td>" . H($ap->{globalprojectnumber}) . "</td>";
 
     $i++;
     $i %= 2;
@@ -1483,14 +1676,8 @@ sub ap_transactions {
     . $locale->text('AP Transaction') . qq|">
 
 <input class=submit type=submit name=action value="|
-    . $locale->text('Vendor Invoice') . qq|">|;
+    . $locale->text('Vendor Invoice') . qq|">
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
   </form>
 
 </body>