X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=c936bc19b771661746f6d4f5b727986f51a5726f;hb=8961864f7c8e4233907f13773adda9c88c39776c;hp=20f1ad8d37cfa67c1dce7cb70425b3ee68f6e4a1;hpb=ee072e4f077213bf6f8792ca8f0a1afebbb6282f;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 20f1ad8d3..c936bc19b 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -111,14 +111,46 @@ 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");
+  %ustva = (41  => "Steuerfrei IGL a. Abnehmer m. UStID (§4 Nr. 1b UStG), Nr. 41",
+            44  => "Steuerfrei IGL n. Fahrz. o. UStID (§4 Nr. 1b UStG), Nr. 44",
+            49  => "Steuerfrei IGL n. Fahrz. a. Unternehmen (§2a UStG), Nr. 49",
+            43  => "Weit Steuerfreie Umsätze m. VSt Abzug (Ausfuhr, Umsätze §4 Nr.2-7 UStG), Nr. 43",
+            48  => "Steuerfreie Umsätze ohne VSt.abzug (§4 Nr.8-28 UStG), Nr. 48",
+            51  => "Steuerpflichtige Umsätze 16%, Nr. 51",
+            511 => "Steuerpflichtige Umsätze 16%, Nr. 51 rechts",
+            86  => "Steuerpflichtige Umsätze 7%, Nr. 86",
+            861 => "Steuerpflichtige Umsätze 7%, Nr. 86 rechts",
+            35  => "Nr. 35",
+            77  => "Nr. 77",
+            76  => "Nr. 76",
+            80  => "Nr. 80",
+            91  => "Steuerfrei, Nr. 91",
+            97  => "Steuerpflichtig 16%, Nr. 97",
+            971 => "Steuerpflichtig 16%, Nr. 97 rechts",
+            93  => "Steuerpflichtig 7%, Nr. 93",
+            931 => "Steuerpflichtig 7%, Nr. 93 rechts",
+            95  => "Nr. 95",
+            94  => "Steuerpflichtig 16%, Nr. 94",            
+            96  => "Nr. 96",
+            42  => "Nr. 42",
+            60  => "Nr. 60",
+            45  => "Nr. 45",
+            52  => "Nr. 52",
+            53  => "Nr. 53",
+            73  => "Nr. 73",
+            74  => "Nr. 74",
+            84  => "Nr. 84",
+            85  => "Nr. 85",
+            65  => "Nr. 65",
+            66  => "Abziehbare Vorsteuerbeträge, Nr. 66",
+            61  => "Nr. 61",
+            62  => "Nr. 62",
+            67  => "Nr. 67",
+            63  => "Nr. 63",
+            64  => "Nr. 64",
+            59  => "Nr. 59",
+            69  => "Nr. 69",
+            39  => "Nr. 39");
   foreach $item (sort({ $a <=> $b } keys %ustva)) {
     if ($item == $form->{pos_ustva}) {
       $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
@@ -282,27 +314,19 @@ 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>
-		<input name=category type=radio class=radio value=Q $checked{Q_}>&nbsp;|
-    . $locale->text('Equity')
-    . qq|\n<br>
+    . $locale->text('Liability') . 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 +340,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 +368,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('COGS') . 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 +1434,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>
@@ -1593,7 +1607,7 @@ sub config {
       ? "<option selected>$item\n"
       : "<option>$item\n";
   }
-
+  
   foreach $item (qw(name company address signature)) {
     $myconfig{$item} =~ s/\"/&quot;/g;
   }
@@ -1605,14 +1619,30 @@ 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"
       : "<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 = '';
+  $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 +1669,9 @@ sub config {
 
   $form->header;
 
+  if ($myconfig{menustyle} eq "old") { $oldS = "checked"; }
+  else { $newS = "checked"; }
+
   print qq|
 <body>
 
@@ -1690,9 +1723,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>
@@ -1709,6 +1747,11 @@ sub config {
 	  <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 +1774,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 +1816,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 +1981,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}> |