X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=7770612ff8650d608318d5f876fc1eb90d5fd715;hb=bbc9fa5eef6ad9cfadb370029cab8429fb82de88;hp=20f1ad8d37cfa67c1dce7cb70425b3ee68f6e4a1;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 20f1ad8d3..7770612ff 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -111,15 +111,51 @@ sub account_header {
 	      </tr>|;
 
   $form->{selectustva} = "<option>\n";
-  %ustva = (48 => "Steuerfrei, Zeile 48",
-            51 => "Steuerpflichtig 16%, Zeile 51",
-            86 => "Steuerpflichtig 7%, Zeile 86",
-            91 => "Steuerfrei, Zeile 91",
-            97 => "Steuerpflichtig 16%, Zeile 97",
-            93 => "Steuerpflichtig 7%, Zeile 93",
-            94 => "Steuerpflichtig 16%, Zeile 94",
-            66 => "Vorsteuer, Zeile 66");
-  foreach $item (sort({ $a <=> $b } keys %ustva)) {
+
+  %ustva = (35  => $locale->text('UStVA-Nr. 35'),
+            36  => $locale->text('UStVA-Nr. 36'),
+            39  => $locale->text('UStVA-Nr. 39'),
+            41  => $locale->text('UStVA-Nr. 41'),
+            42  => $locale->text('UStVA-Nr. 42'),
+            43  => $locale->text('UStVA-Nr. 43'),
+            44  => $locale->text('UStVA-Nr. 44'),
+            45  => $locale->text('UStVA-Nr. 45'),
+            48  => $locale->text('UStVA-Nr. 48'),
+            49  => $locale->text('UStVA-Nr. 49'),
+            51  => $locale->text('UStVA-Nr. 51 left'),
+            511 => $locale->text('UStVA-Nr. 51 right'),
+            52  => $locale->text('UStVA-Nr. 52'),
+            53  => $locale->text('UStVA-Nr. 53'),
+            59  => $locale->text('UStVA-Nr. 59'),
+            60  => $locale->text('UStVA-Nr. 60'),
+            61  => $locale->text('UStVA-Nr. 61'),
+            62  => $locale->text('UStVA-Nr. 62'),
+            63  => $locale->text('UStVA-Nr. 63'),
+            64  => $locale->text('UStVA-Nr. 64'),
+            65  => $locale->text('UStVA-Nr. 65'),
+            66  => $locale->text('UStVA-Nr. 66'),
+            67  => $locale->text('UStVA-Nr. 67'),
+            69  => $locale->text('UStVA-Nr. 69'),
+            73  => $locale->text('UStVA-Nr. 73'),
+            74  => $locale->text('UStVA-Nr. 74'),
+            76  => $locale->text('UStVA-Nr. 76'),
+            77  => $locale->text('UStVA-Nr. 77'),
+            80  => $locale->text('UStVA-Nr. 80'),
+            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'),
+            91  => $locale->text('UStVA-Nr. 91'),
+            93  => $locale->text('UStVA-Nr. 93 left'),
+            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";
     } else {
@@ -178,7 +214,7 @@ sub account_header {
 
   $eur = qq|
 	      <tr>
-		<th align=right>| . $locale->text('EÜR') . qq|</th>
+		<th align=right>| . $locale->text('EUER') . qq|</th>
 		<td><select name=pos_eur>$form->{selecteur}</select></td>
 		<input type=hidden name=selecteur value="$form->{selecteur}">
 	      </tr>|;
@@ -223,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')
@@ -257,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>
@@ -282,27 +319,21 @@ sub account_header {
 	    <table>
 	      <tr valign=top>
 		<td><input name=category type=radio class=radio value=A $checked{A_}>&nbsp;|
-    . $locale->text('Asset')
-    . qq|\n<br>
+    . $locale->text('Asset') . qq|\n<br>
 		<input name=category type=radio class=radio value=L $checked{L_}>&nbsp;|
-    . $locale->text('Liability')
-    . qq|\n<br>
+    . $locale->text('Liability') . qq|\n<br>
 		<input name=category type=radio class=radio value=Q $checked{Q_}>&nbsp;|
-    . $locale->text('Equity')
-    . qq|\n<br>
+    . $locale->text('Equity') . qq|\n<br>
 		<input name=category type=radio class=radio value=I $checked{I_}>&nbsp;|
-    . $locale->text('Revenue')
-    . qq|\n<br>
+    . $locale->text('Revenue') . qq|\n<br>
 		<input name=category type=radio class=radio value=E $checked{E_}>&nbsp;|
-    . $locale->text('Expense')
-    . qq|</td>
+    . $locale->text('Expense') . qq|</td>
 		<td width=50>&nbsp;</td>
 		<td>
 		<input name=charttype type=radio class=radio value="H" $checked{H}>&nbsp;|
     . $locale->text('Heading') . qq|<br>
 		<input name=charttype type=radio class=radio value="A" $checked{A}>&nbsp;|
-    . $locale->text('Account')
-    . qq|</td>
+    . $locale->text('Account') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -316,8 +347,7 @@ sub account_header {
 	    <table>
 	      <tr>
 		<th align=left>|
-      . $locale->text('Is this a summary account to record')
-      . qq|</th>
+      . $locale->text('Is this a summary account to record') . qq|</th>
 		<td>
 		<input name=AR type=checkbox class=checkbox value=AR $form->{AR}>&nbsp;|
       . $locale->text('AR')
@@ -345,41 +375,33 @@ sub account_header {
 	      <tr>
 		<td>
 		<input name=AR_amount type=checkbox class=checkbox value=AR_amount $form->{AR_amount}>&nbsp;|
-      . $locale->text('Revenue')
-      . qq|\n<br>
+      . $locale->text('Revenue') . qq|\n<br>
 		<input name=AR_paid type=checkbox class=checkbox value=AR_paid $form->{AR_paid}>&nbsp;|
-      . $locale->text('Receipt')
-      . qq|\n<br>
+      . $locale->text('Receipt') . qq|\n<br>
 		<input name=AR_tax type=checkbox class=checkbox value=AR_tax $form->{AR_tax}>&nbsp;|
       . $locale->text('Tax') . qq|
 		</td>
 		<td>
 		<input name=AP_amount type=checkbox class=checkbox value=AP_amount $form->{AP_amount}>&nbsp;|
-      . $locale->text('Expense/Asset')
-      . qq|\n<br>
+      . $locale->text('Expense/Asset') . qq|\n<br>
 		<input name=AP_paid type=checkbox class=checkbox value=AP_paid $form->{AP_paid}>&nbsp;|
-      . $locale->text('Payment')
-      . qq|\n<br>
+      . $locale->text('Payment') . qq|\n<br>
 		<input name=AP_tax type=checkbox class=checkbox value=AP_tax $form->{AP_tax}>&nbsp;|
       . $locale->text('Tax') . qq|
 		</td>
 		<td>
 		<input name=IC_sale type=checkbox class=checkbox value=IC_sale $form->{IC_sale}>&nbsp;|
-      . $locale->text('Revenue')
-      . qq|\n<br>
+      . $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>
 		<td>
 		<input name=IC_income type=checkbox class=checkbox value=IC_income $form->{IC_income}>&nbsp;|
-      . $locale->text('Revenue')
-      . qq|\n<br>
+      . $locale->text('Revenue') . qq|\n<br>
 		<input name=IC_expense type=checkbox class=checkbox value=IC_expense $form->{IC_expense}>&nbsp;|
-      . $locale->text('Expense')
-      . qq|\n<br>
+      . $locale->text('Expense') . qq|\n<br>
 		<input name=IC_taxservice type=checkbox class=checkbox value=IC_taxservice $form->{IC_taxservice}>&nbsp;|
       . $locale->text('Tax') . qq|
 		</td>
@@ -1419,8 +1441,7 @@ sub sic_header {
   <tr>
     <td></td>
     <th align=left><input name=sictype type=checkbox style=checkbox value="H" $checked> |
-    . $locale->text('Heading')
-    . qq|</th>
+    . $locale->text('Heading') . qq|</th>
   <tr>
   <tr>
     <th align=right>| . $locale->text('Description') . qq|</th>
@@ -1605,7 +1626,8 @@ sub config {
   %countrycodes = User->country_codes;
   $countrycodes = '';
   foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes) {
+                keys %countrycodes
+    ) {
     $countrycodes .=
       ($myconfig{countrycode} eq $key)
       ? "<option selected value=$key>$countrycodes{$key}\n"
@@ -1613,6 +1635,19 @@ sub config {
   }
   $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 = '';
+  $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) {
+    $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} .=
@@ -1639,6 +1674,9 @@ sub config {
 
   $form->header;
 
+  if ($myconfig{menustyle} eq "old") { $oldS = "checked"; }
+  else { $newS = "checked"; }
+
   print qq|
 <body>
 
@@ -1690,9 +1728,14 @@ sub config {
 	  <td><select name=dateformat>$dateformat</select></td>
 	</tr>
 	<tr>
-	  <th align=right>| . $locale->text('Number Format') . qq|</th>
+	  <th align=right>| . $locale->text('Output Number Format') . qq|</th>
 	  <td><select name=numberformat>$numberformat</select></td>
 	</tr>
+	<tr>
+	  <th align=right>| . $locale->text('Input Number Format') . qq|</th>
+	  <td><select name=in_numberformat>$in_numberformat</select></td>
+	</tr>
+
 	<tr>
 	  <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
 	  <td><input name=vclimit size=10 value="$myconfig{vclimit}"></td>
@@ -1701,14 +1744,15 @@ sub config {
 	  <th align=right>| . $locale->text('Language') . qq|</th>
 	  <td><select name=countrycode>$countrycodes</select></td>
 	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Character Set') . qq|</th>
-	  <td><input name=charset size=20 value="$myconfig{charset}"></td>
-	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('Stylesheet') . qq|</th>
 	  <td><select name=usestylesheet>$selectstylesheet</select></td>
 	</tr>
+	<tr>
+	  <th align=right>| . $locale->text('Setup Menu') . qq|</th>
+	  <td><input name=menustyle type=radio class=radio value=neu $newS>&nbsp;New
+  		  <input name=menustyle type=radio class=radio value=old $oldS>&nbsp;Old</td>
+	</tr>	
 	<input name=printer type=hidden value="$myconfig{printer}">
 	<tr class=listheading>
 	  <th colspan=2>&nbsp;</th>
@@ -1731,8 +1775,7 @@ sub config {
 	</tr>
 	<tr class=listheading>
 	  <th colspan=2>|
-    . $locale->text('Last Numbers & Default Accounts')
-    . qq|</th>
+    . $locale->text('Last Numbers & Default Accounts') . qq|</th>
 	</tr>
 	<tr>
 	  <td colspan=2>
@@ -1774,38 +1817,31 @@ sub config {
 		<th align=right nowrap>| . $locale->text('Last Invoice Number') . qq|</th>
 		<td><input name=invnumber size=10 value=$form->{defaults}{invnumber}></td>
                 <th align=right nowrap>|
-    . $locale->text('Last Customer Number')
-    . qq|</th>
+    . $locale->text('Last Customer Number') . qq|</th>
 		<td><input name=customernumber size=10 value=$form->{defaults}{customernumber}></td>
 	      </tr>
 	      <tr>
 		<th align=right nowrap>|
-    . $locale->text('Last Sales Order Number')
-    . qq|</th>
+    . $locale->text('Last Sales Order Number') . qq|</th>
 		<td><input name=sonumber size=10 value=$form->{defaults}{sonumber}></td>
                 <th align=right nowrap>|
-    . $locale->text('Last Vendor Number')
-    . qq|</th>
+    . $locale->text('Last Vendor Number') . qq|</th>
 		<td><input name=vendornumber size=10 value=$form->{defaults}{vendornumber}></td>
 	      </tr>
 	      <tr>
 		<th align=right nowrap>|
-    . $locale->text('Last Purchase Order Number')
-    . qq|</th>
+    . $locale->text('Last Purchase Order Number') . qq|</th>
 		<td><input name=ponumber size=10 value=$form->{defaults}{ponumber}></td>
                 <th align=right nowrap>|
-    . $locale->text('Last Article Number')
-    . qq|</th>
+    . $locale->text('Last Article Number') . qq|</th>
 		<td><input name=articlenumber size=10 value=$form->{defaults}{articlenumber}></td>
 	      </tr>
 	      <tr>
 		<th align=right nowrap>|
-    . $locale->text('Last Sales Quotation Number')
-    . qq|</th>
+    . $locale->text('Last Sales Quotation Number') . qq|</th>
 		<td><input name=sqnumber size=10 value=$form->{defaults}{sqnumber}></td>
                 <th align=right nowrap>|
-    . $locale->text('Last Service Number')
-    . qq|</th>
+    . $locale->text('Last Service Number') . qq|</th>
 		<td><input name=servicenumber size=10 value=$form->{defaults}{servicenumber}></td>
 	      </tr>
 	      <tr>
@@ -1946,8 +1982,7 @@ sub audit_control {
       <table>
 	<tr>
 	  <td>|
-    . $locale->text('Enforce transaction reversal for all dates')
-    . qq|</th>
+    . $locale->text('Enforce transaction reversal for all dates') . qq|</th>
 	  <td><input name=revtrans class=radio type=radio value="1" $checked{Y}> |
     . $locale->text('Yes')
     . qq| <input name=revtrans class=radio type=radio value="0" $checked{N}> |