X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=0ce8c2ee6d371106e68626fec8b151b91b757a06;hb=da10bf753ae49b8322e79fc1bb9276a092403b9a;hp=652b3ed187936b3d513c8f7b5d84982a05742be5;hpb=9d679693eeb06baf737355f5c07ea7abf33e7dbb;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 652b3ed18..0ce8c2ee6 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -96,13 +96,16 @@ sub account_header {
   $form->{description} =~ s/\"/"/g;
 
   if (@{ $form->{TAXKEY} }) {
-    foreach $item (@{ $form->{TAXKEY} }) {
+    foreach my $item (@{ $form->{TAXKEY} }) {
+
+      $item->{rate} = $item->{rate} * 100 . '%';
+
       if ($item->{tax} == $form->{tax}) {
         $form->{selecttaxkey} .=
-          "<option value=$item->{tax} selected>$item->{taxdescription}\n";
+          "<option value=$item->{tax} selected>$item->{taxdescription} ($item->{rate})\n";
       } else {
         $form->{selecttaxkey} .=
-          "<option value=$item->{tax}>$item->{taxdescription}\n";
+          "<option value=$item->{tax}>$item->{taxdescription} ($item->{rate})\n";
       }
 
     }
@@ -1112,9 +1115,7 @@ sub list_business {
     $discount =
       $form->format_amount(\%myconfig, $ref->{discount} * 100);
     $description =
-      ($ref->{salesman})
-      ? "<b>$ref->{description}</b>"
-      : "$ref->{description}";
+      $ref->{description};
     $column_data{description} =
       qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;
     $column_data{discount}           = qq|<td align=right>$discount</td>|;
@@ -1164,7 +1165,6 @@ sub business_header {
   $lxdebug->enter_sub();
 
   $form->{title}    = $locale->text("$form->{title} Business");
-  $form->{salesman} = "checked" if $form->{salesman};
 
   # $locale->text('Add Business')
   # $locale->text('Edit Business')
@@ -1200,10 +1200,6 @@ sub business_header {
     <th align=right>| . $locale->text('Customernumberinit') . qq|</th>
     <td><input name=customernumberinit size=10 value=$form->{customernumberinit}></td>
   </tr>
-  <tr>
-    <td align=right>| . $locale->text('Salesman') . qq|</td>
-    <td><input name=salesman class=checkbox type=checkbox value=1 $form->{salesman}></td>
-  </tr>
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
@@ -1646,7 +1642,7 @@ sub list_buchungsgruppe {
       $column_data{up} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
       $column_data{up} = qq|<td width="16">&nbsp;</td>|;
@@ -1659,7 +1655,7 @@ sub list_buchungsgruppe {
       $column_data{down} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
@@ -2092,7 +2088,6 @@ sub delete_printer {
   $lxdebug->leave_sub();
 }
 
-
 sub add_payment {
   $lxdebug->enter_sub();
 
@@ -2214,7 +2209,7 @@ sub list_payment {
       $column_data{up} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
       $column_data{up} = qq|<td width="16">&nbsp;</td>|;
@@ -2227,7 +2222,7 @@ sub list_payment {
       $column_data{down} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
@@ -2626,9 +2621,13 @@ sub config {
     }
   }
 
-  opendir CSS, "css/.";
-  @all = grep /.*\.css$/, readdir CSS;
-  closedir CSS;
+#  opendir CSS, "css/.";
+#  @all = grep /.*\.css$/, readdir CSS;
+#  closedir CSS;
+
+# css dir has styles that are not intended as general layouts.
+# reverting to hardcoded list
+  @all = qw(lx-office-erp.css Win2000.css);
 
   foreach $item (@all) {
     if ($item eq $myconfig{stylesheet}) {
@@ -3199,6 +3198,100 @@ sub save_unit {
   $lxdebug->leave_sub();
 }
 
+sub show_history_search {
+	$lxdebug->enter_sub();
+	
+	$form->{title} = $locale->text("History Search");
+    $form->header();
+    
+    print $form->parse_html_template("/common/search_history");
+	
+	$lxdebug->leave_sub();
+}
+
+sub show_am_history {
+	$lxdebug->enter_sub();
+	my %search = ( "Artikelnummer" => "parts",
+				   "Kundennummer"  => "customer",
+				   "Lieferantennummer" => "vendor",
+				   "Projektnummer" => "project",
+				   "Buchungsnummer" => "oe",
+				   "Eingangsrechnungnummer" => "ap",
+				   "Ausgangsrechnungnummer" => "ar"
+		);
+	my %searchNo = ( "Artikelnummer" => "partnumber",
+				     "Kundennummer"  => "customernumber",
+				     "Lieferantennummer" => "vendornumber",
+				     "Projektnummer" => "projectnummer",
+				     "Buchungsnummer" => "ordnumber",
+				     "Eingangsrechnungnummer" => "invnumber",
+				     "Ausgangsrechnungnummer" => "invnumber"
+		);
+	
+	my $restriction;
+	my $tempNo = 0;
+	foreach(split(/\,/, $form->{einschraenkungen})) {
+		if($tempNo == 0) {
+			$restriction .= " AND addition = '" . $_ . "'";
+			$tempNo = 1;
+		} 
+		else {
+			$restriction .= " OR addition = '" . $_ . "'";
+		}
+	}
+	
+	$restriction .= (($form->{transdate} ne "" && $form->{reqdate} ne "") 
+						? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+						: (($form->{transdate} ne "" && $form->{reqdate} eq "") 
+							? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
+							: ($form->{transdate} eq "" && $form->{reqdate} ne "") 
+								? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+								: ""
+							)
+						);
+	
+	my $dbh = $form->dbconnect(\%myconfig);
+	
+	$restriction .= ($form->{mitarbeiter} eq "" ? "" 
+					: ($form->{mitarbeiter} =~ /^[0-9]*$/  
+						? " AND employee_id = " . $form->{mitarbeiter} 
+						: " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
+	
+	my $query = qq|SELECT id FROM $search{$form->{what2search}} 
+				   WHERE $searchNo{$form->{'what2search'}} ILIKE '$form->{"searchid"}' 
+				   |;
+	
+	my $sth = $dbh->prepare($query);
+	
+	$sth->execute() || $form->dberror($query);
+	
+	$form->{title} = $locale->text("History Search");
+	$form->header();
+	
+	while(my $hash_ref = $sth->fetchrow_hashref()){
+		print $form->parse_html_template("/common/show_history", 
+			{"DATEN" => $form->get_history($dbh,$hash_ref->{id},$restriction),
+			 "SUCCESS" => ($form->get_history($dbh,$hash_ref->{id},$restriction) != 0),
+			 "NONEWWINDOW" => "1"	
+			}
+		);
+	}
+	$dbh->disconnect();
+	
+	$lxdebug->leave_sub();
+}
+
+sub get_employee_id {
+	$lxdebug->enter_sub();
+	my $query = qq|SELECT id FROM employee WHERE name = '| . $_[0] . qq|'|;
+	my $sth = $_[1]->prepare($query);
+	$sth->execute() || $form->dberror($query);
+	my $return = $sth->fetch();
+	$sth->finish();
+	return ${$return}[0];
+	$lxdebug->leave_sub();
+}
+
 sub swap_units {
   $lxdebug->enter_sub();