X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d629acd82a27e980899a044ca8b0f4becc8e94bb..2ef21b8f2aaae439a9408977458bdeb9b0fd9e25:/templates/webpages/ustva/report_master.html

diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html
index 9f195539e..5e2687e92 100644
--- a/templates/webpages/ustva/report_master.html
+++ b/templates/webpages/ustva/report_master.html
@@ -37,14 +37,18 @@
             <TMPL_VAR co_email ESCAPE=HTML>
             <br />
             <br />
+
             <translate>Tax Number</translate>:&nbsp;
+<TMPL_IF COA_Germany>
             <TMPL_VAR taxnumber_given>
             <br />
             <translate>ELSTER Tax Number</translate>:&nbsp;
             <TMPL_VAR elstersteuernummer ESCAPE=HTML>
             <br />
             <br />
-
+<TMPL_ELSE>
+            <TMPL_VAR taxnumber>
+</TMPL_IF>
             </fieldset>
             <br />
             
@@ -52,12 +56,12 @@
               <fieldset>
               <legend>
                 <input checked="checked" 
-                 title = "<translate>Assume Tax Consultant Data in Tax Computation?</translate>"
-                 name = "FA_steuerberater" 
-                 id = "steuerberater" 
-                 class = "checkbox" 
-                 type = "checkbox"
-                 value = "1" >
+                 title="<translate>Assume Tax Consultant Data in Tax Computation?</translate>"
+                 name="FA_steuerberater" 
+                 id="steuerberater" 
+                 class="checkbox" 
+                 type="checkbox"
+                 value="1" >
                  &nbsp;<b><translate>Tax Consultant</translate></b>
                 </legend>
                 
@@ -91,9 +95,6 @@
             </fieldset>
           </td>
           <td width="50%" valign="top">	  
-
-<!--            TMPL_IF FA_Name                   -->
-
               <fieldset>
               <legend>
                  <b><translate>Tax Office</translate></b>
@@ -160,27 +161,15 @@
               <legend>
               <b><translate>Outputformat</translate></b>
               </legend>
+<TMPL_IF COA_Germany>
               <TMPL_VAR select_options>
-              </fieldset>
-              
-            <TMPL_ELSE>
+<TMPL_ELSE>
+              <SELECT name="format">
+                <option value="generic"><translate>Preview</translate></option>
+              </SELECT>
+</TMPL_if>
 
-              <td width="50%" valign="bottom">
-              <fieldset>
-              <legend>
-              <b><translate>Hints</translate></b>
-              </legend>
-              <h2 class="confirm">
-              <translate>Missing Preferences: Outputroutine
-                 disabled</translate>
-              </h2>
-              <h3><translate>Help</translate></h3>
-              <ul>
-              <li><translate>Hint-Missing-Preferences</translate></li>
-              </ul>
               </fieldset>
-
-            </TMPL_IF>
           </td>
         </tr>
       </table>
@@ -202,8 +191,7 @@
   <tr>
    <td align="left">
      <input type=hidden name=nextsub value=generate_ustva>
-     <input <TMPL_UNLESS FA_Name>disabled="disabled"</TMPL_UNLESS>
-      type=submit class=submit name=action value="<translate>Show</translate>">
+     <input type=submit class=submit name=action value="<translate>Show</translate>">
    </td>
    <td align="right">