X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=7770612ff8650d608318d5f876fc1eb90d5fd715;hb=bbc9fa5eef6ad9cfadb370029cab8429fb82de88;hp=95cb35312fa689c9ce85d4c41264529544045804;hpb=46ca64fbb0bb7979abd074b0af612ac88c8a8fdf;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 95cb35312..7770612ff 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -111,7 +111,7 @@ sub account_header {
 	      </tr>|;
 
   $form->{selectustva} = "<option>\n";
-  
+
   %ustva = (35  => $locale->text('UStVA-Nr. 35'),
             36  => $locale->text('UStVA-Nr. 36'),
             39  => $locale->text('UStVA-Nr. 39'),
@@ -144,17 +144,17 @@ sub account_header {
             84  => $locale->text('UStVA-Nr. 84'),
             85  => $locale->text('UStVA-Nr. 85'),
             86  => $locale->text('UStVA-Nr. 86 left'),
-            861 => $locale->text('UStVA-Nr. 86 right'),            
+            861 => $locale->text('UStVA-Nr. 86 right'),
             91  => $locale->text('UStVA-Nr. 91'),
             93  => $locale->text('UStVA-Nr. 93 left'),
-            931 => $locale->text('UStVA-Nr. 93 right'),            
+            931 => $locale->text('UStVA-Nr. 93 right'),
             94  => $locale->text('UStVA-Nr. 94'),
             95  => $locale->text('UStVA-Nr. 95'),
             96  => $locale->text('UStVA-Nr. 96'),
             97  => $locale->text('UStVA-Nr. 97 links'),
             971 => $locale->text('UStVA-Nr. 97 rechts'),
             98  => $locale->text('UStVA-Nr. 98'));
-            
+
   foreach $item (sort({ $a cmp $b } keys %ustva)) {
     if ($item == $form->{pos_ustva}) {
       $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
@@ -259,22 +259,23 @@ sub account_header {
 		<input type=hidden name=selectbwa value="$form->{selectbwa}">
 	      </tr>|;
 
-  $form->{selectbilanz} = "<option>\n";
-  foreach $item ((1, 2, 3, 4)) {
-    if ($item == $form->{pos_bilanz}) {
-      $form->{selectbilanz} .= "<option value=$item selected>$item\n";
-    } else {
-      $form->{selectbilanz} .= "<option value=$item>$item\n";
-    }
-
-  }
-
-  $bilanz = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Bilanz') . qq|</th>
-		<td><select name=pos_bilanz>$form->{selectbilanz}</select></td>
-		<input type=hidden name=selectbilanz value="$form->{selectbilanz}">
-	      </tr>|;
+# Entfernt bis es ordentlich umgesetzt wird (hli) 30.03.2006
+#  $form->{selectbilanz} = "<option>\n";
+#  foreach $item ((1, 2, 3, 4)) {
+#    if ($item == $form->{pos_bilanz}) {
+#      $form->{selectbilanz} .= "<option value=$item selected>$item\n";
+#    } else {
+#      $form->{selectbilanz} .= "<option value=$item>$item\n";
+#    }
+#
+#  }
+#
+#  $bilanz = qq|
+#	      <tr>
+#		<th align=right>| . $locale->text('Bilanz') . qq|</th>
+#		<td><select name=pos_bilanz>$form->{selectbilanz}</select></td>
+#		<input type=hidden name=selectbilanz value="$form->{selectbilanz}">
+#	      </tr>|;
 
   # this is for our parser only!
   # type=submit $locale->text('Add Account')
@@ -293,8 +294,8 @@ sub account_header {
 <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>
 <input type=hidden name=income_accno_id value=$form->{income_accno_id}>
 <input type=hidden name=expense_accno_id value=$form->{expense_accno_id}>
-<input type=hidden name=fxgain_accno_id values=$form->{fxgain_accno_id}>
-<input type=hidden name=fxloss_accno_id values=$form->{fxloss_accno_id}>
+<input type=hidden name=fxgain_accno_id value=$form->{fxgain_accno_id}>
+<input type=hidden name=fxloss_accno_id value=$form->{fxloss_accno_id}>
 
 <table border=0 width=100%>
   <tr>
@@ -321,6 +322,8 @@ sub account_header {
     . $locale->text('Asset') . qq|\n<br>
 		<input name=category type=radio class=radio value=L $checked{L_}>&nbsp;|
     . $locale->text('Liability') . qq|\n<br>
+		<input name=category type=radio class=radio value=Q $checked{Q_}>&nbsp;|
+    . $locale->text('Equity') . qq|\n<br>
 		<input name=category type=radio class=radio value=I $checked{I_}>&nbsp;|
     . $locale->text('Revenue') . qq|\n<br>
 		<input name=category type=radio class=radio value=E $checked{E_}>&nbsp;|
@@ -390,7 +393,7 @@ sub account_header {
 		<input name=IC_sale type=checkbox class=checkbox value=IC_sale $form->{IC_sale}>&nbsp;|
       . $locale->text('Revenue') . qq|\n<br>
 		<input name=IC_cogs type=checkbox class=checkbox value=IC_cogs $form->{IC_cogs}>&nbsp;|
-      . $locale->text('COGS') . qq|\n<br>
+      . $locale->text('Expense') . qq|\n<br>
 		<input name=IC_taxpart type=checkbox class=checkbox value=IC_taxpart $form->{IC_taxpart}>&nbsp;|
       . $locale->text('Tax') . qq|
 		</td>
@@ -1611,7 +1614,7 @@ sub config {
       ? "<option selected>$item\n"
       : "<option>$item\n";
   }
-  
+
   foreach $item (qw(name company address signature)) {
     $myconfig{$item} =~ s/\"/&quot;/g;
   }
@@ -1631,22 +1634,20 @@ sub config {
       : "<option value=$key>$countrycodes{$key}\n";
   }
   $countrycodes = "<option>American English\n$countrycodes";
-  
+
   # use an other input number format than output numberformat
   # look at Form.pm, sub parse_amount
-  my $ in_numberformat = '';
+  my $in_numberformat = '';
   $text1 = qq|value="0">| . $locale->text('equal Outputformat');
   $text2 = qq|value="1">| . $locale->text('1000,00 or 1000.00');
   @in_nf = ($text1, $text2);
-  foreach $item ( @in_nf ) {
+  foreach $item (@in_nf) {
     $in_numberformat .=
-      ( substr($item, 7, 1) eq $myconfig{in_numberformat})
+      (substr($item, 7, 1) eq $myconfig{in_numberformat})
       ? "<option selected $item\n"
       : "<option $item\n";
   }
 
-
-  
   foreach $key (keys %{ $form->{IC} }) {
     foreach $accno (sort keys %{ $form->{IC}{$key} }) {
       $myconfig{$key} .=