X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c3c5403ce5f3cdccd51120537b6e01021f1ec712..d7f060429e809653d45e93e86b3c5c8d7129e0a9:/bin/mozilla/ap.pl

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index b0ab9905c..a3356a74d 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -93,9 +93,6 @@ 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";
 
@@ -319,6 +316,9 @@ sub form_header {
   };
   //-->
   </script>|;
+  # show history button
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
 
   # set option selected
   foreach $item (qw(vendor currency department)) {
@@ -455,7 +455,7 @@ selectvendor } </select>|
   }
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
   if ($form->{jsscript}) {
 
@@ -880,11 +880,11 @@ sub form_footer {
   # button for saving history
   if($form->{id} ne "") {
     print qq|
-  	  <input type=button class=submit onclick=set_history_window(|
+  	  <input type="button" class="submit" onclick="set_history_window(|
   	  . $form->{id} 
-  	  . qq|); name=history id=history value=|
+  	  . qq|);" name="history" id="history" value="|
   	  . $locale->text('history') 
-  	  . qq|>|;
+  	  . qq|">|;
   }
   # /button for saving history
   print "
@@ -1204,7 +1204,7 @@ sub search {
   $form->{title} = $locale->text('AP Transactions');
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
   if ($form->{jsscript}) {
 
@@ -1456,9 +1456,11 @@ sub ap_transactions {
   }
 
   @columns =
-    qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+    qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
        due duedate notes employee globalprojectnumber);
 
+  $form->{"l_type"} = "Y";
+
   foreach $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
       push @column_index, $item;
@@ -1482,6 +1484,8 @@ sub ap_transactions {
       qq|<th><a class=listheading href=$href&sort=transdate>|
     . $locale->text('Date')
     . qq|</a></th>|;
+  $column_header{type} =
+      "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
   $column_header{duedate} =
       qq|<th><a class=listheading href=$href&sort=duedate>|
     . $locale->text('Due Date')
@@ -1596,6 +1600,10 @@ sub ap_transactions {
     $subtotaldue       += ($ap->{amount} - $ap->{paid});
 
     $column_data{transdate} = "<td>$ap->{transdate}&nbsp;</td>";
+    $column_data{type} = "<td>" .
+      ($ap->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
+                           $locale->text("AP Transaction (abbreviation)"))
+        . "</td>";
     $column_data{duedate}   = "<td>$ap->{duedate}&nbsp;</td>";
     $column_data{datepaid}  = "<td>$ap->{datepaid}&nbsp;</td>";