Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / datev / export_bewegungsdaten.html

diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
index e10aa79..80f6c3a 100644 (file)
--- a/templates/webpages/datev/export_bewegungsdaten.html
+++ b/templates/webpages/datev/export_bewegungsdaten.html
@@ -29,7 +29,7 @@
             <option value=9>[% 'September' | $T8 %]</option>
             <option value=10>[% 'October' | $T8 %]</option>
             <option value=11>[% 'November' | $T8 %]</option>
-            <option value=12>[% 'December' | $T8 %]</option>
+            <option value=12>[% 'December last year period' | $T8 %]</option>
           </select></td>
         </tr>
         <tr>
@@ -92,10 +92,27 @@
      <td>
         <table>
          <tr>
+          [% IF show_pk_option %]
            <td align=left>[% 'Export with CV Charts' | $T8 %]</td>
            <td align=left></td>
-           <td>[% L.checkbox_tag('use_pk', value => 1, checked => 0) %]</td>
+           <td>[% L.checkbox_tag('use_pk', value = 1, checked = 0) %]</td>
+          [% ELSE %]
+           <td align=left><font color="gray">[% 'Export with CV Charts' | $T8 %]</font></td>
+           <td align=left></td>
+           <td>[% L.checkbox_tag('use_pk', value = 1, checked = 0, disabled = 1) %] </td>
+           <td colspan="2"><font color="gray">[% 'Hint: Not all VC Numbers are personal accounts compliant' | $T8 %]</font></td>
+          [% END %]
          </tr>
+         <tr>
+           <td align=left>[% 'Lock bookings' | $T8 %]</td>
+           <td align=left></td>
+           <td colspan="3">[% L.yes_no_tag('locked', 0) %]</td>
+        </tr>
+         <tr>
+           <td align=left>[% 'Export imported bookings' | $T8 %]</td>
+           <td align=left></td>
+           <td colspan="3">[% L.yes_no_tag('imported', 0) %]</td>
+        </tr>
         </table>
      </td>
    </tr>
@@ -104,15 +121,15 @@
   </tr>
 </table>
 
-<input type=hidden name=beraternr value="[% beraternr %]">
-<input type=hidden name=dfvkz value="[% dfvkz %]">
-<input type=hidden name=beratername value="[% beratername %]">
-<input type=hidden name=passwort value="[% passwort %]">
-<input type=hidden name=mandantennr value="[% mandantennr %]">
-<input type=hidden name=datentraegernr value="[% datentraegernr %]">
-<input type=hidden name=kne value="[% kne %]">
-<input type=hidden name=csv value="[% csv %]">
-<input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
+<input type=hidden name=beraternr value="[% beraternr | html %]">
+<input type=hidden name=dfvkz value="[% dfvkz | html %]">
+<input type=hidden name=beratername value="[% beratername | html %]">
+<input type=hidden name=passwort value="[% passwort | html %]">
+<input type=hidden name=mandantennr value="[% mandantennr | html %]">
+<input type=hidden name=datentraegernr value="[% datentraegernr | html %]">
+<input type=hidden name=exportformat value="[% exportformat | html %]">
+<input type=hidden name=abrechnungsnr value="[% abrechnungsnr | html %]">
+
+<input type=hidden name=exporttype value="[% exporttype | html %]">
 
-<input type=hidden name=exporttype value="[% exporttype %]">
 </form>