From 222b0ac2392ccaa66544d2444be35b5e32428210 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Tue, 4 Apr 2023 11:59:53 +0200
Subject: [PATCH] importvorlage kontoauszuege 2.betrag

---
 www/pages/content/importvorlage_formate.tpl | 5 +++++
 www/pages/importvorlage.php                 | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/www/pages/content/importvorlage_formate.tpl b/www/pages/content/importvorlage_formate.tpl
index 8f536f53..1de615f1 100644
--- a/www/pages/content/importvorlage_formate.tpl
+++ b/www/pages/content/importvorlage_formate.tpl
@@ -578,6 +578,11 @@
 							    <td>Betrag</td>
 							    <td></td>
 						    </tr>
+						    <tr>
+							    <td>betrag2</td>
+							    <td>Betrag (wenn z.B. Soll / Haben getrennt)</td>
+							    <td></td>
+						    </tr>
 						    <tr>
 							    <td>waehrung</td>
 							    <td>W&auml;hrung</td>
diff --git a/www/pages/importvorlage.php b/www/pages/importvorlage.php
index 1ff054c2..af234f57 100644
--- a/www/pages/importvorlage.php
+++ b/www/pages/importvorlage.php
@@ -5081,7 +5081,7 @@ class Importvorlage extends GenImportvorlage {
           break;
           case 'kontoauszug':
 
-            $allowed_fields = array('konto','buchung','betrag','waehrung','buchungstext','buchungstext2','buchungstext3','buchungstext4');
+            $allowed_fields = array('konto','buchung','betrag','betrag2','waehrung','buchungstext','buchungstext2','buchungstext3','buchungstext4');
 
             $error = false;
 
@@ -5119,6 +5119,11 @@ class Importvorlage extends GenImportvorlage {
                 $row['soll'] = $row['betrag'];
                 unset($row['betrag']);
 
+                if (empty($row['soll'])) {
+                    $row['soll'] = $row['betrag2'];
+                }
+                unset($row['betrag2']);
+
                 $row['buchung'] = $this->app->erp->ReplaceDatum(true,$row['buchung'],false);
 
                 // Calculate hash