X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdatev.pl;h=4ada35f109624f47a852aec4d615a04fac42daad;hb=a35013886c936227e97cc868b77be1e584ad4272;hp=5f8c61e4353d6a2697fd54d340d19726cf2c2f91;hpb=f8138d1721521673da949aeac440011dfe0a22c8;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 5f8c61e43..4ada35f10 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -31,18 +31,24 @@ use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 use SL::Common;
 use SL::DATEV;
 
+use strict;
+
 1;
 
 # end of main
 
 require "bin/mozilla/common.pl";
 
-sub continue { call_sub($form->{"nextsub"}); }
+sub continue { call_sub($main::form->{"nextsub"}); }
 
 sub export {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -66,45 +72,45 @@ sub export {
   <tr valign=top>
     <td>
       <table>
-	<tr>
-	  <td align=left nowrap>| . $locale->text("Beraternummer") . qq|</td>
-	  <td><input name=beraternr size=10 maxlength=7 value="$form->{beraternr}"></td>
-
-	  <td align=left nowrap>| . $locale->text("DFV-Kennzeichen") . qq|</td>
-	  <td><input name=dfvkz size=5 maxlength=2 value="$form->{dfvkz}"></td>
-	</tr>
-	<tr>
-	  <td align=left nowrap>| . $locale->text("Beratername") . qq|</td>
-	  <td><input name=beratername size=10 maxlength=9 value="$form->{beratername}"></td>
-
-	  <td align=left nowrap>| . $locale->text("Password") . qq|</td>
-	  <td><input name=passwort size=5 maxlength=4 value="$form->{passwort}"></td>
-	</tr>
-	<tr>
-	  <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
-	  <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
-
-	  <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
-	  <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
-	</tr>
-	<tr>
-	  | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Beraternummer") . qq|</td>
+          <td><input name=beraternr size=10 maxlength=7 value="$form->{beraternr}"></td>
+
+          <td align=left nowrap>| . $locale->text("DFV-Kennzeichen") . qq|</td>
+          <td><input name=dfvkz size=5 maxlength=2 value="$form->{dfvkz}"></td>
+        </tr>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Beratername") . qq|</td>
+          <td><input name=beratername size=10 maxlength=9 value="$form->{beratername}"></td>
+
+          <td align=left nowrap>| . $locale->text("Password") . qq|</td>
+          <td><input name=passwort size=5 maxlength=4 value="$form->{passwort}"></td>
+        </tr>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
+          <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
+
+          <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
+          <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
+        </tr>
+        <tr>
+          | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
     qq|<td><input type="hidden" name="kne" value="1"></td>
           <td></td>
 
-	  <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
-	  <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
-	</tr>
+          <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
+          <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
+        </tr>
 
         <tr>
           <td><input name=exporttype type=radio class=radio value=0 checked> |
     . $locale->text("Export Buchungsdaten") . qq|</td>
           <td></td>
 
-	  <td><input name=exporttype type=radio class=radio value=1> |
+          <td><input name=exporttype type=radio class=radio value=1> |
     . $locale->text("Export Stammdaten") . qq|</td>
           <td></td>
-	</td>
+        </td>
       </table>
     </td>
   </tr>
@@ -123,26 +129,32 @@ sub export {
 </body>
 </html>
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export2 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
     &export_stammdaten();
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_bewegungsdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -202,17 +214,17 @@ sub export_bewegungsdaten {
   <tr valign=top>
     <td>
       <table>
-	<tr>
+        <tr>
           <td align=left><input checked name=zeitraum class=radio type=radio value=monat>&nbsp;</td><td align=left>|
     . $locale->text('Monat') . qq|</td>
           <td align=left></td>
-	  <td align=left></td>
+          <td align=left></td>
           <td align=left><select name=monat>$form->{allemonate}</select></td>
         </tr>
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=quartal>&nbsp;</td><td align=left>|
     . $locale->text('Quartal') . qq|</td>
-	  <td align=left></td>
+          <td align=left></td>
           <td align=left></td>
           <td align=left><select name=quartal>$form->{allequartale}</select></td>
         </tr>
@@ -221,10 +233,10 @@ sub export_bewegungsdaten {
     . $locale->text('Datum von') . qq|</td>
           <td align=left><input id=transdatefrom name=transdatefrom size=10>
             <input type="button" name="transdatefrom" id="trigger_transdatefrom" value="?"></td>
-	  <td align=left>| . $locale->text('bis') . qq|</td>
+          <td align=left>| . $locale->text('bis') . qq|</td>
           <td align=left><input id=transdateto name=transdateto size=10>
             <input type="button" name="transdateto" id="trigger_transdateto" value="?"></td>
-	</tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -259,13 +271,16 @@ sub export_bewegungsdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_stammdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -287,11 +302,11 @@ sub export_stammdaten {
     <td>
       <table>
         <tr>
-	  <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
           <td align=left><input name=accnofrom size=8 maxlength=8></td>
         </tr>
         <tr>
-	  <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
           <td align=left><input name=accnoto size=8 maxlength=8></td>
         </tr>
       </table>
@@ -323,13 +338,17 @@ sub export_stammdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export3 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   DATEV::clean_temporary_directories();
 
@@ -344,6 +363,8 @@ sub export3 {
 
       print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br><br><a href="$link">Download</a>|);
 
+      print $form->parse_html_template('datev/net_gross_difference') if @{ $form->{net_gross_differences} };
+
     } else {
       $form->error("KNE-Export schlug fehl.");
     }
@@ -362,13 +383,16 @@ sub export3 {
 
   print("</body></html>");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub download {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $auth->assert('datev_export');
+  $main::auth->assert('datev_export');
 
   my $tmp_name = Common->tmpname();
   my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip", localtime(time()));
@@ -408,5 +432,5 @@ sub download {
 
   DATEV::clean_temporary_directories();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }