X-Git-Url: https://git.infodrom.org/?p=infodrom%2Fdtaus;a=blobdiff_plain;f=dtaus.c;h=4a8851613dd894cc6d5ee6e369c7992e2511677d;hp=70785f64005b93deda544d898cabf4e95beaedb6;hb=9b4d285a11a61180100f2931c5dc6e5ebcca9ca4;hpb=8d1968b976c324581401cc9c977434e0cbe20849

diff --git a/dtaus.c b/dtaus.c
index 70785f6..4a88516 100644
--- a/dtaus.c
+++ b/dtaus.c
@@ -1,6 +1,6 @@
 /*
     dtaus.c - Belegloser Datenträgeraustausch mit einer Bank
-    Copyright (c) 1996,8,2001  Martin Schulze <joey@infodrom.org>
+    Copyright (c) 1996,8,2001-4  Martin Schulze <joey@infodrom.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,10 +27,13 @@
 #include <ctype.h>
 #include <time.h>
 #include <malloc.h>
+#include "latex.h"
 
-/* #define DEFAULT_EURO */
+#define DEFAULT_EURO
 #ifndef DEFAULT_EURO
 int use_euro = 0;
+#else
+int use_euro = 1;
 #endif
 
 /*
@@ -60,8 +63,11 @@ dtaus_record recA[] = {
   {"BLZ", 7, 8, REQ},
   {"Referenz", 70, 10, OPT},
   {"Datum", 50, 6, IGN},
+  {"Ausfuehrung", 95, 8, OPT},
+  {"Currency", 127, 1, OPT},
   {"Euro", 127, 1, OPT},
-  {NULL, 0, 0}
+  {"DM", 127, 1, OPT},
+  {NULL, 0, 0, 0}
 };
 
 #define A_TRANS	0
@@ -70,8 +76,12 @@ dtaus_record recA[] = {
 #define A_BLZ	3
 #define A_REF	4
 #define A_DATE	5
-#define A_EURO	6
-#define A_LEN	7
+#define A_TODO	6
+#define A_CURR	7
+#define A_EURO	8
+#define A_DM	9
+#define A_LEN	10
+#define A_LOOP	7
 
 dtaus_record recC[] = {
   {"Name", 93, 27, REQ},
@@ -87,13 +97,15 @@ dtaus_record recC[] = {
   {"myName", 128, 27, OPT},
   {"myKonto", 69, 10, OPT},
   {"myBLZ", 61, 8, OPT},
-  {"Euro", 182, 1, IGN},
   {"Text", 187, 29, OPT},
   {"Extension", 216, 29, OPT},
+  {"Currency", 182, 1, IGN},
 #ifndef DEFAULT_EURO
   {"Betrag-Euro", 79, 11, IGN},
+#else
+  {"Betrag-DM", 50, 11, IGN},
 #endif
-  {NULL, 0, 0}
+  {NULL, 0, 0, 0}
 };
 
 #define C_NAME	0
@@ -105,15 +117,16 @@ dtaus_record recC[] = {
 #define C_MYNAM	6
 #define C_MYKTO	7
 #define C_MYBLZ	8
-#define C_EURO  9
-#define C_TEXT 10
-#define C_EXT  11
+#define C_TEXT  9
+#define C_EXT  10
+#define C_EURO 11
 #ifndef DEFAULT_EURO
 #define C_EUR  12
-#define C_LEN  13
 #else
-#define C_LEN  12
+#define C_DM   12
 #endif
+#define C_LEN  13
+#define C_LOOP 11
 
 #define MAX_TEXT 14
 
@@ -128,8 +141,10 @@ dtaus_record recE[] = {
   {"BLZs", 47, 17, IGN},
 #ifndef DEFAULT_EURO
   {"Summe-Euro", 64, 13, IGN},
+#else
+  {"Summe-DM", 17, 13, IGN},
 #endif
-  {NULL, 0, 0}
+  {NULL, 0, 0, 0}
 };
 
 #define E_COUNT	0
@@ -138,7 +153,10 @@ dtaus_record recE[] = {
 #define E_BLZ	3
 #ifndef DEFAULT_EURO
 #define E_EUR	4
+#else
+#define E_DM	4
 #endif
+#define E_LEN	5
 
 /*
  *  Second: Some low level routines
@@ -146,7 +164,7 @@ dtaus_record recE[] = {
 
 size_t dtaus_nextrec (void **buf, FILE *f)
 {
-  bzero (buf, 128);
+  memset (buf, 0, 128);
   return fread(buf, 128, 1, f);
 }
 
@@ -232,7 +250,7 @@ char *strip_nondigits (char *s)
 char dtaus_char (void *buf, unsigned int pos)
 {
   static char res;
-  char *bufp = buf;
+  char *bufp = (char *)buf;
 
   bufp+=pos;
   memcpy(&res, bufp, 1);
@@ -256,15 +274,57 @@ char *real2string(char *s)
 {
   static char res[20];
   char *cp;
+  char *xp;	/* only to avoid a GCC warning */
 
-  strcpy(res, s);
+  strncpy(res, s, sizeof(res)-1);
+  res[sizeof(res)-1] = 0;
   for (cp=res; *cp&&!(*cp == ',')&&!(*cp == '.');cp++);
-  *(cp++) = *(cp+1);
-  *(cp++) = *(cp+1);
+
+  if ((cp-res) >= (sizeof(res)-3)) { 
+    /* Bail out, since the number is too large, shouldn't be possible though. */
+    fprintf (stderr, "Value %s too large.\n", res);
+    exit (1);
+  }
+
+  if (*cp == '.' || *cp == ',') {
+    if (*(cp+1)) {
+      /* 1st decimal place */
+      xp = cp+1;
+      if (*xp && isdigit(*xp))
+	*(cp++) = *xp;
+      else
+	*(cp++) = '0';
+      /* 2nd decimal place */
+      xp = cp+1;
+      if (*xp && isdigit(*xp))
+	*(cp++) = *xp;
+      else
+	*(cp++) = '0';
+    } else {
+      *(cp++) = '0';
+      *(cp++) = '0';
+    }
+  } else {
+    *(cp++) = '0';
+    *(cp++) = '0';
+  }
   *cp = '\0';
   return res;
 }
 
+/*
+ * Return the last digit of the year as character
+ */
+char get_date_lastdigit()
+{
+  time_t timer;
+  struct tm *loctime;
+
+  timer = time ( NULL );
+  loctime = localtime(&timer);
+  return loctime->tm_year % 10 + '0';
+}
+
 char *string2trans (char *s)
 {
   static char res[30];
@@ -283,7 +343,7 @@ char *string2trans (char *s)
   else if (!strcmp(s, "53000"))
     sprintf (res, "Lohn");
   else if (!strncmp(s, "5400", 4))
-    sprintf (res, "Vermögen");
+    sprintf (res, "Vermögen %c",s[4]);
   /*  else if (!strcmp(s, "56000"))
     sprintf (res, ""); / * Überweisung öffentlicher Kassen */
   return res;
@@ -292,6 +352,7 @@ char *string2trans (char *s)
 char *trans2string (char *s)
 {
   static char res[30];
+  char *cp;
 
   res[0] = '\0';
   if (!strcmp(s, "Abbuchung"))
@@ -306,8 +367,34 @@ char *trans2string (char *s)
     sprintf (res, "51000");
   else if (!strcmp(s, "Lohn"))
     sprintf (res, "53000");
-  else if (!strncmp(s, "Vermögen", 4))
-    sprintf (res, "5400");
+  else {
+    cp = NULL;
+    if (!strncmp(s, "Vermögen", 8))
+      cp = s+8;
+    if (!strncmp(s, "Vermoegen", 9))
+      cp = s+9;
+
+    if (!cp) {
+      fprintf (stderr, "Unbekannte Transaktion `%s'\n", res);
+      exit (1);
+    }
+
+    /*
+      Vermögen --> 5400<heutiges Jahr>
+      Vermögen 8 -> 5400<8>
+      Vermögen 2003 -> 5400<3>
+     */
+
+    if (*cp) while (!isspace(*cp)) cp++;
+    while (isspace(*cp)) cp++;
+
+    if (!*cp || !isdigit(*cp))
+      sprintf (res, "5400%c",get_date_lastdigit());
+    else {
+      while (isdigit(*cp)) cp++;
+      sprintf (res, "5400%c",*(cp-1));
+    }
+  }
   /*  else if (!strcmp(s, ""))
     sprintf (res, "56000"); / * Überweisung öffentlicher Kassen */
   return res;
@@ -344,7 +431,7 @@ char *ext2string (char *s)
 unsigned long int dtaus_int(void *buf, unsigned int pos, unsigned int len)
 {
   char tmp[30];
-  char *bufp = buf;
+  char *bufp = (char *)buf;
   static unsigned long int res;
 
   bufp+=pos;
@@ -364,8 +451,8 @@ char *extract_ident (char *line)
   static char word[30];
 
   if (strlen(line) > 0) {
-    x = index (line, ' ');
-    y = index (line, '\t');
+    x = strchr (line, ' ');
+    y = strchr (line, '\t');
 
     if (!x && !y) {
         strncpy(word, line, 29);
@@ -438,8 +525,8 @@ size_t control_nextline (void **buf, int len, FILE *f)
   char *cp;
   int i;
 
-  bzero (line, sizeof(line));
-  bzero (buf, len);
+  memset (line, 0, sizeof(line));
+  memset (buf, 0, len);
   cp = line;
 
   while (!strlen(line) && (cp = fgets(line, 100, f))) {
@@ -450,7 +537,7 @@ size_t control_nextline (void **buf, int len, FILE *f)
 	  while (tmp[strlen(tmp)-1] != '\n' && (cp = fgets(tmp, 100, f)));
 	} else
 	  line[strlen(line)-1] = '\0';
-	if (line[strlen(line)-1] == '
')
+	if (line[strlen(line)-1] == '\r')
 	  line[strlen(line)-1] = '\0';
 	for (i=strlen(line);(line[i-1] == ' '||line[i-1] == '\t')&&i>0; i--)
 	  line[i-1] = '\0';
@@ -469,6 +556,9 @@ size_t control_nextline (void **buf, int len, FILE *f)
     return 0;
 }
 
+/*
+ * Return the current date nicely formatted
+ */
 char *get_date()
 {
   static char res[10];
@@ -492,7 +582,7 @@ void dtaus_prepareA (char *buf)
   struct tm *loctime;
   char tmp[10];
 
-  bzero (buf, 129);
+  memset (buf, 0, 129);
   timer = time ( NULL );
   loctime = localtime(&timer);
 
@@ -507,14 +597,10 @@ void dtaus_prepareA (char *buf)
   for (i=56;i<56+4; i++) buf[i] = ' ';		/* A8 */
   for (i=70;i<70+10; i++) buf[i] = '0';		/* A10 */
   for (i=80;i<80+48; i++) buf[i] = ' ';		/* A11 */
-#ifdef DEFAULT_EURO
-  buf[127] = '1';				/* A12 (Currency) */
-#else
   if (use_euro)
-    buf[127] = '1';				/* A12 (Currency) */
+    buf[recA[A_CURR].pos] = '1';				/* A12 (Currency) */
   else
-    buf[127] = ' ';				/* A12 (Currency) */
-#endif
+    buf[recA[A_CURR].pos] = ' ';				/* A12 (Currency) */
 }
 
 /*
@@ -526,7 +612,7 @@ void dtaus_prepareC (char *buf, int normaltext, int maxtext)
   int i;
   int appendix = 0;
 
-  bzero (buf, 257);
+  memset (buf, 0, 257);
 
   if (normaltext)
     appendix = 1;
@@ -546,18 +632,14 @@ void dtaus_prepareC (char *buf, int normaltext, int maxtext)
   for (i=31;i<31+13; i++) buf[i] = '0';		/* C6 */
   buf[49] = ' ';				/* C8 */
   for (i=50;i<50+11; i++) buf[i] = '0';		/* C9 (Betrag) */
-  for (i=79;i<79+11; i++) buf[i] = '0';		/* C12 (Euro) */
+  for (i=79;i<79+11; i++) buf[i] = '0';		/* C12 (Betrag Euro) */
   for (i=90;i<90+3; i++) buf[i] = ' ';		/* C13 */
   for (i=93;i<90+27; i++) buf[i] = ' ';		/* C14a (Kunde) */
   for (i=120;i<120+8; i++) buf[i] = ' ';	/* C14b */
-#ifdef DEFAULT_EURO
-  buf[182] = '1';				/* C17a (Currency) */
-#else
   if (use_euro)
-    buf[182] = '1';				/* C17a (Currency) */
+    buf[recC[C_EURO].pos] = '1';				/* C17a (Currency) */
   else
-    buf[182] = ' ';				/* C17a (Currency) */
-#endif
+    buf[recC[C_EURO].pos] = ' ';				/* C17a (Currency) */
   for (i=183;i<183+2; i++) buf[i] = ' ';	/* C17b */
   for (i=187;i<187+(29*2); i++) buf[i] = ' ';	/* C19-C22 (misc text) */
   for (i=245;i<245+11; i++) buf[i] = ' ';	/* C23 */
@@ -574,7 +656,7 @@ void dtaus_prepareE (char *buf)
 {
   int i;
 
-  bzero (buf, 129);
+  memset (buf, 0, 129);
   buf[0] = '0';
   buf[1] = '1';
   buf[2] = '2';
@@ -609,12 +691,16 @@ int dtaus_writeA(FILE *f, char **values)
   dtaus_prepareA(buf);
   buf[5] = values[A_TRANS][0];
   buf[6] = values[A_TRANS][1];
-  sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),8));
-  for (i=0; i<8; i++) buf[recA[A_BLZ].pos+i] = tmp[i];
+  sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),recA[A_BLZ].len));
+  for (i=0; i<recA[A_BLZ].len; i++) buf[recA[A_BLZ].pos+i] = tmp[i];
   sprintf (tmp, "%-27.27s", upcase(values[A_NAME]));
   for (i=0; i<27; i++) buf[recA[A_NAME].pos+i] = tmp[i];
-  sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_KTO]),10));
-  for (i=0; i<10; i++) buf[recA[A_KTO].pos+i] = tmp[i];
+  if (values[A_TODO]) {
+    sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_TODO]),recA[A_TODO].len));
+    for (i=0; i<recA[A_TODO].len; i++) buf[recA[A_TODO].pos+i] = tmp[i];
+  }
+  sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_KTO]),recA[A_KTO].len));
+  for (i=0; i<recA[A_KTO].len; i++) buf[recA[A_KTO].pos+i] = tmp[i];
 
   fputs(buf, f);
   return 1;
@@ -645,7 +731,7 @@ int dtaus_writeC(FILE *f, char **valuesA, char **values, char **text)
     }
   sprintf (tmp, "%s", trans2string(values[C_TRANS]));
   if (!strlen(tmp)) {
-    fprintf (stderr, "Ungültiger Typ, nur Abbuchung, Einzug, E-Cash, E-Cash-A, Gutschrift und Lohn erlaubt.\n");
+    fprintf (stderr, "Ungültige Transaktion, nur Abbuchung, Einzug, E-Cash, E-Cash-A, Gutschrift und Lohn erlaubt.\n");
     return 0;
   }
 
@@ -677,7 +763,10 @@ int dtaus_writeC(FILE *f, char **valuesA, char **values, char **text)
   else
     for (i=0; i<recC[C_EUR].len; i++) buf[recC[C_EUR].pos+i] = tmp[i];
 #else
-  for (i=0; i<recC[C_VAL].len; i++) buf[recC[C_VAL].pos+i] = tmp[i];
+  if (use_euro)
+    for (i=0; i<recC[C_VAL].len; i++) buf[recC[C_VAL].pos+i] = tmp[i];
+  else
+    for (i=0; i<recC[C_DM].len; i++) buf[recC[C_DM].pos+i] = tmp[i];
 #endif
   if (values[C_MYKTO])
     sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[C_MYKTO]),10));
@@ -747,7 +836,10 @@ int dtaus_writeE(FILE *f, int count, bigint sum, bigint blz, bigint kto)
   else
     for (i=0; i<recE[E_EUR].len; i++) buf[recE[E_EUR].pos+i] = tmp[i];
 #else
-  for (i=0; i<recE[E_VAL].len; i++) buf[recE[E_VAL].pos+i] = tmp[i];
+  if (use_euro)
+    for (i=0; i<recE[E_VAL].len; i++) buf[recE[E_VAL].pos+i] = tmp[i];
+  else
+    for (i=0; i<recE[E_DM].len; i++) buf[recE[E_DM].pos+i] = tmp[i];
 #endif
   bigint_sprintf (tmp, "%s", kto);
   padzeroclip (tmp,17);
@@ -766,6 +858,50 @@ void printctln(FILE *f, char *field, char *value)
     fprintf(f, "  %s\t%s\n", field, value);
 }
 
+/*
+ * one date line, format it properly
+ */
+void printctlndate(FILE *f, char *field, char *value)
+{
+  char mydate[11];
+  int i;
+
+  if (!strlen(field) || !strlen(value))
+    return;
+
+  for (i=0;isspace (value[i]) && i<= strlen (value); i++);
+  if (i == strlen (value))
+    return;
+
+  memset (mydate, 0, sizeof (mydate));
+  if (strlen (value) == 6) {
+    mydate[0] = value[0];
+    mydate[1] = value[1];
+    mydate[2] = '.';
+    mydate[3] = value[2];
+    mydate[4] = value[3];
+    mydate[5] = '.';
+    mydate[6] = value[4];
+    mydate[7] = value[5];
+    fprintf(f, "  %s\t%s\n", field, mydate);
+  } else if (strlen (value) == 8) {
+    mydate[0] = value[0];
+    mydate[1] = value[1];
+    mydate[2] = '.';
+    mydate[3] = value[2];
+    mydate[4] = value[3];
+    mydate[5] = '.';
+    mydate[6] = value[4];
+    mydate[7] = value[5];
+    mydate[8] = value[6];
+    mydate[9] = value[7];
+    fprintf(f, "  %s\t%s\n", field, mydate);
+  } else {
+    fprintf (stderr, "Broken date field: %s\n", value);
+    fprintf(f, "  %s\t%s\n", field, value);
+  }
+}
+
 
 /*
  *  Third: Some high level routines
@@ -774,8 +910,8 @@ void printctln(FILE *f, char *field, char *value)
 void dtaus2control (char *cdtaus, char *ccontrol)
 {
   FILE *fdtaus, *fcontrol;
-  void *buf;
-  void *bufp;
+  char *buf;
+  char *bufp;
   char tmp[30];
   char x[30];
   int index;
@@ -807,24 +943,28 @@ void dtaus2control (char *cdtaus, char *ccontrol)
   /* 
    * Record A lesen
    */
-  if (dtaus_nextrec(buf, fdtaus) == 1) {
+  if (dtaus_nextrec((void *)buf, fdtaus) == 1) {
     if (dtaus_char(buf,4) == 'A') {
       fprintf(fcontrol, "BEGIN {\n");
       bufp = buf;
 
-      for (index=A_TRANS; index < A_DATE; index++) {
+      for (index=A_TRANS; index < A_LOOP; index++) {
 	bufp = buf + recA[index].pos;
 	memcpy(tmp, bufp, recA[index].len); tmp[recA[index].len] = '\0';
-	printctln(fcontrol, recA[index].name, strip_zeros(strip_spaces(tmp)));
+	if (index == A_DATE || index == A_TODO)
+	  printctlndate(fcontrol, recA[index].name, tmp);
+	else
+	  printctln(fcontrol, recA[index].name, strip_zeros(strip_spaces(tmp)));
       }
 
-      index = A_DATE; bufp = buf + recA[index].pos;
-      memcpy(tmp, bufp, recA[index].len); tmp[recA[index].len] = '\0';
-      printctln(fcontrol, recA[index].name, strip_spaces(tmp));
-
-      index = A_EURO; bufp = buf + recA[index].pos;
-      memcpy(tmp, bufp, recA[index].len); tmp[recA[index].len] = '\0';
-      printctln(fcontrol, recA[index].name, strip_zeros(strip_spaces(tmp)));
+      bufp = buf + recA[A_CURR].pos;
+      if (*bufp == '1') {
+	use_euro = 1;
+	fprintf(fcontrol, "  Euro\n");
+      } else {
+	use_euro = 0;
+	fprintf(fcontrol, "  DM\n");
+      }
 
       fprintf(fcontrol, "}\n\n");
     } else {
@@ -839,24 +979,50 @@ void dtaus2control (char *cdtaus, char *ccontrol)
   /*
    * Record C lesen
    */
-  if (dtaus_nextrec(buf, fdtaus) == 1) {
+  if (dtaus_nextrec((void *)buf, fdtaus) == 1) {
     while (dtaus_char(buf,4) == 'C') {
       bufp = buf + 128;
-      if (dtaus_nextrec(bufp, fdtaus) != 1) {
+      if (dtaus_nextrec((void *)bufp, fdtaus) != 1) {
 	fprintf (stderr, "Der zweite Teil der Transaktion ist kaputt.\n");
 	return;
       } else {
 	fprintf(fcontrol, "{\n");
 
-	for (index=C_NAME; index <= C_EURO; index++) {
+	for (index=C_NAME; index < C_LOOP; index++) {
+#ifndef DEFAULT_EURO
+	  if (use_euro && index == C_VAL)
+	    index = C_EUR;
+#else
+	  if (!use_euro && index == C_VAL)
+	    index = C_DM;
+#endif
 	  bufp = buf + recC[index].pos;
 	  memcpy(tmp, bufp, recC[index].len); tmp[recC[index].len] = '\0';
-	  if (index == C_VAL)
+
+	  /*
+	   * C_EUR and C_DM are outside of the loop, can only be
+	   * selected for the non-default currency, but the value
+	   * should be stored in the normal record field.
+	   */
+#ifndef DEFAULT_EURO
+	  if (index == C_EUR)
+#else
+	  if (index == C_DM)
+#endif
+	    printctln(fcontrol, recC[C_VAL].name, strip_zeros(string2real(tmp)));
+	  else if (index == C_VAL)
 	    printctln(fcontrol, recC[index].name, strip_zeros(string2real(tmp)));
 	  else if (index == C_TRANS)
 	    printctln(fcontrol, recC[index].name, strip_zeros(string2trans(tmp)));
 	  else
 	    printctln(fcontrol, recC[index].name, strip_zeros(strip_spaces(tmp)));
+#ifndef DEFAULT_EURO
+	  if (use_euro && index == C_EUR)
+	    index = C_VAL;
+#else
+	  if (!use_euro && index == C_DM)
+	    index = C_VAL;
+#endif
 	}
 
 	for (index=C_TEXT; index <= C_EXT; index++) {
@@ -877,8 +1043,8 @@ void dtaus2control (char *cdtaus, char *ccontrol)
 	  if (res.rem) extC++;
 	}
       }
-      if (dtaus_nextrec(buf, fdtaus) != 1)
-	bzero (buf, sizeof(buf));
+      if (dtaus_nextrec((void *)buf, fdtaus) != 1)
+	memset (buf, 0, sizeof(buf));
 
       /*
        * Are there extension records that we have to check?
@@ -896,8 +1062,8 @@ void dtaus2control (char *cdtaus, char *ccontrol)
 	    printctln(fcontrol, string2ext(x), strip_spaces(tmp));
 	  }
 	}
-	if (dtaus_nextrec(buf, fdtaus) != 1)
-	  bzero (buf, sizeof(buf));
+	if (dtaus_nextrec((void *)buf, fdtaus) != 1)
+	  memset (buf, 0, sizeof(buf));
 	extC--;
       }
       fprintf(fcontrol, "}\n");
@@ -913,12 +1079,32 @@ void dtaus2control (char *cdtaus, char *ccontrol)
       fprintf(fcontrol, "\nEND {\n");
 
       for (index=E_COUNT; index <= E_BLZ; index++) {
+#ifndef DEFAULT_EURO
+	if (use_euro && index == E_VAL)
+	  index = E_EUR;
+#else
+	if (!use_euro && index == E_VAL)
+	  index = E_DM;
+#endif
+
 	bufp = buf + recE[index].pos;
 	memcpy(tmp, bufp, recE[index].len); tmp[recE[index].len] = '\0';
-	if (index == E_VAL)
-	  printctln(fcontrol, recE[index].name, strip_zeros(string2real(tmp)));
+
+#ifndef DEFAULT_EURO
+	if (index == E_VAL || index == E_EUR)
+#else
+	if (index == E_VAL || index == E_DM)
+#endif
+	  printctln(fcontrol, recE[E_VAL].name, strip_zeros(string2real(tmp)));
 	else
 	  printctln(fcontrol, recE[index].name, strip_zeros(tmp));
+#ifndef DEFAULT_EURO
+	  if (use_euro && index == E_EUR)
+	    index = E_VAL;
+#else
+	  if (!use_euro && index == E_DM)
+	    index = E_VAL;
+#endif
       }
 
       fprintf(fcontrol, "}\n");
@@ -934,13 +1120,12 @@ void dtaus2control (char *cdtaus, char *ccontrol)
   fclose(fdtaus);
 }
 
-int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
+int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck, char *latex)
 {
   FILE *fdtaus, *fcontrol, *fbeleg, *fcheck;
   void *buf;
   char *ident;
   int  recindex;
-  char tmp[30];
   char line[100];
   char *valA[A_LEN], *valC[C_LEN];
   int count;
@@ -948,6 +1133,11 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
   char **text = NULL;
   char *cp;
   int textindex = 0;
+  int len, i;
+  char *type = NULL;
+  char *currency = NULL;
+  char date_todo[11];
+  char ssum_val[30], ssum_kto[30], ssum_blz[30];
 
   if (!cdtaus) {
     if (!(fdtaus = fopen("dtaus0.txt", "w")))
@@ -990,7 +1180,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
   /* 
    * Record A lesen
    */
-  bzero(valA, sizeof(valA));
+  memset (valA, 0, sizeof(valA));
   control_nextline ((void *)line, 100, fcontrol);
   ident = extract_ident(line);
   if (!strcmp(ident, "begin") && (line[0] == '{')) {
@@ -998,40 +1188,46 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
     while (strlen(line) && line[0] != '}') {
       ident = extract_ident(line);
       if ((recindex = rec_index(ident, REC_A)) != -1)
-#ifndef DEFAULT_EURO
 	{
-#endif
 	if (recA[recindex].type != IGN)
 	  if ((valA[recindex] = (char *)malloc (strlen(line)+1)))
 	    strcpy(valA[recindex], line);
-#ifndef DEFAULT_EURO
 	} else {
 	  if (! strcasecmp (ident, "euro"))
 	    use_euro = 1;
+	  if (! strcasecmp (ident, "dm"))
+	    use_euro = 0;
 	}
-#endif
       control_nextline ((void *)line, 100, fcontrol);
     }
     if (((recindex = rec_index("art", REC_A)) != -1) && valA[recindex] && strlen(valA[recindex])) {
-      fprintf(fbeleg, "\n\n");
-      fprintf(fbeleg, "\n    Begleitzettel\n\n");
-      fprintf(fbeleg, "\n    Belegloser Datentraegeraustausch\n\n");
       if (valA[recindex][0] == 'L')
-	fprintf(fbeleg, "\n    Sammeleinziehungsauftrag\n\n");
+	type = strdup ("Sammeleinziehungsauftrag");
       else if (valA[recindex][0] == 'G')
-	fprintf(fbeleg, "\n    Sammelueberweisungsauftrag\n\n");
+	type = strdup ("Sammelueberweisungsauftrag");
       else
-	fprintf(fbeleg, "\n    Sammelauftrag\n\n");
-      fprintf(fbeleg, "\n    VOL ........................:\n");
-      fprintf(fbeleg, "\n    Erstellungsdatum ...........: %s\n", get_date());
-#ifndef DEFAULT_EURO
+	type = strdup ("Sammelauftrag");
+
       if (use_euro)
-	fprintf(fbeleg, "\n    Waehrung ...................: Euro\n");
+	currency = strdup ("Euro");
       else
-	fprintf(fbeleg, "\n    Waehrung ...................: DM\n");
-#else
-      fprintf(fbeleg, "\n    Waehrung ...................: Euro\n");
-#endif
+	currency = strdup ("DM");
+
+      if (valA[A_TODO])
+	sprintf (date_todo, valA[A_TODO]);
+      else
+	memset (date_todo, 0, sizeof (date_todo));
+
+      fprintf(fbeleg, "\n\n");
+      fprintf(fbeleg, "\n    Begleitzettel\n\n");
+      fprintf(fbeleg, "\n    Belegloser Datentraegeraustausch\n\n");
+      fprintf(fbeleg, "\n    %s\n\n", type);
+      fprintf(fbeleg, "\n    VOL ........................:\n");
+      fprintf(fbeleg, "\n    Erstellungsdatum ...........: %s\n", get_date());
+      if (date_todo) {
+	fprintf(fbeleg, "\n    Ausfuehrungsdatum ..........: %s\n", date_todo);
+      }
+      fprintf(fbeleg, "\n    Waehrung ...................: %s\n", currency);
     }
     if (!dtaus_writeA(fdtaus, valA)) {
       fprintf (stderr, "Konnte den Anfangsdatensatz nicht schreiben.\n");
@@ -1046,14 +1242,10 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
     else
       fprintf (fcheck, "    Sammelauftrag\n\n");
     fprintf (fcheck, "    Erstellungsdatum : %s\n\n", get_date());
-#ifndef DEFAULT_EURO
     if (use_euro)
       fprintf (fcheck, "    Waehrung         : Euro\n\n\n");
     else
       fprintf (fcheck, "    Waehrung         : DM\n\n\n");
-#else
-    fprintf (fcheck, "    Waehrung         : Euro\n\n\n");
-#endif
     fprintf (fcheck, "     %-10s  %-8s  %-30s   %12s\n", "Kontonr.", "BLZ", "Name", "Betrag");
     fprintf (fcheck, "    --------------------------------------------------------------------\n");
   } else {
@@ -1068,7 +1260,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
   sum_val = bigint_int(0);
   sum_blz = bigint_int(0);
   sum_kto = bigint_int(0);
-  bzero(valC, sizeof(valC));
+  memset (valC, 0, sizeof(valC));
   control_nextline ((void *)line, 100, fcontrol);
   if (line[0] == '{') {
     while (strlen(line) && line[0] == '{') {
@@ -1103,10 +1295,31 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
 		}
 	      }
 	    } else {
-	      if ((valC[recindex] = (char *)malloc (strlen(line)+1)))
-		strcpy(valC[recindex], line);
-	      else
-		return 0;
+	      len = strlen(line);
+	      if (recindex == C_VAL) {
+		/* Convert commast to dots for later processing */
+		for (i=0; line[i]; i++) if (line[i] == ',') line[i] = '.';
+
+		if ((cp = strchr (line, '.')) == NULL) {
+		  if (!(valC[recindex] = (char *)malloc (strlen(line)+4)))
+		    return 0;
+		  sprintf (valC[recindex], "%s.00", line);
+		} else if ( ((len = cp - line + 3)) < strlen (line)) {
+		  if (!(valC[recindex] = (char *)malloc (len+1)))
+                    return 0;
+                  strncpy (valC[recindex], line, len);
+		  valC[recindex][len] = '\0';
+		} else {
+                  if (!(valC[recindex] = (char *)malloc (strlen(line)+1)))
+                    return 0;
+		  strcpy(valC[recindex], line);
+		}
+	      } else {
+		if ((valC[recindex] = (char *)malloc (strlen(line)+1)))
+		  strcpy(valC[recindex], line);
+		else
+		  return 0;
+	      }
 	    }
 	  }
 	control_nextline ((void *)line, 100, fcontrol);
@@ -1124,7 +1337,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
       for (recindex=0; recindex<C_LEN; recindex++)
 	if (valC[recindex])
 	  free(valC[recindex]);
-      bzero(valC, sizeof(valC));
+      memset (valC, 0, sizeof(valC));
       control_nextline ((void *)line, 100, fcontrol);
     }
   } else {
@@ -1137,23 +1350,30 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
    */
   dtaus_writeE(fdtaus, count, sum_val, sum_blz, sum_kto);
   fprintf (fcheck, "    --------------------------------------------------------------------\n");
-  bigint_sprintf (tmp, "%s", sum_val);
   fprintf (fbeleg, "\n    Anzahl .....................: %d\n", count);
-  recindex=strlen(tmp);
-  tmp[recindex+1] = '\0';
-  tmp[recindex] = tmp[recindex-1];
-  tmp[recindex-1] = tmp[recindex-2];
-  tmp[recindex-2] = '.';
-  fprintf (fcheck, "     %-52s %14s\n", "Summe", tmp);
-  fprintf (fbeleg, "\n    Summe ......................: %s\n", tmp);
-  bigint_sprintf (tmp, "%s", sum_kto);
-  fprintf (fbeleg, "\n    Kontrollsumme Kontonummern .: %s\n", tmp);
-  bigint_sprintf (tmp, "%s", sum_blz);
-  fprintf (fbeleg, "\n    Kontrollsumme Bankleitzahlen: %s\n", tmp);
+  bigint_sprintf (ssum_val, "%s", sum_val);
+  recindex=strlen(ssum_val);
+  ssum_val[recindex+1] = '\0';
+  ssum_val[recindex] = ssum_val[recindex-1];
+  ssum_val[recindex-1] = ssum_val[recindex-2];
+  ssum_val[recindex-2] = '.';
+  fprintf (fcheck, "     %-52s %14s\n", "Summe", ssum_val);
+  fprintf (fbeleg, "\n    Summe ......................: %s\n", ssum_val);
+  bigint_sprintf (ssum_kto, "%s", sum_kto);
+  fprintf (fbeleg, "\n    Kontrollsumme Kontonummern .: %s\n", ssum_kto);
+  bigint_sprintf (ssum_blz, "%s", sum_blz);
+  fprintf (fbeleg, "\n    Kontrollsumme Bankleitzahlen: %s\n", ssum_blz);
   fprintf (fbeleg, "\n    Unsere Kontonummer .........: %s\n", valA[A_KTO]);
   fprintf (fbeleg, "\n    Unsere Bankleitzahl ........: %s\n", valA[A_BLZ]);
   fprintf (fbeleg, "\n\n\n\n\n    __________________________________________________\n");
   fprintf (fbeleg, "    Ort, Datum                     Unterschrift\n");
+
+  if (latex)
+    generate_latex_receipt (latex, type, get_date(), date_todo,
+			    currency, count,
+			    ssum_val, ssum_kto, ssum_blz,
+			    valA[A_KTO], valA[A_BLZ]);
+
   for (recindex=0; recindex<A_LEN; recindex++)
     if (valA[recindex])
       free(valA[recindex]);