edekakam/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-04-01 19:10:23 +02:00
Code Issues Projects Releases Wiki Activity

importvorlage kontoauszuege 2.betrag

Browse Source
This commit is contained in:
OpenXE 2023-04-04 11:59:53 +02:00
parent 1e59009862
commit 222b0ac239
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/pages/content/importvorlage_formate.tpl
View File

@ -578,6 +578,11 @@
<td>Betrag</td> <td>Betrag</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>betrag2</td>
<td>Betrag (wenn z.B. Soll / Haben getrennt)</td>
<td></td>
</tr>
<tr> <tr>
<td>waehrung</td> <td>waehrung</td>
<td>W&auml;hrung</td> <td>W&auml;hrung</td>

7
www/pages/importvorlage.php
View File

@ -5081,7 +5081,7 @@ class Importvorlage extends GenImportvorlage {
break; break;
case 'kontoauszug': 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; $error = false;
@ -5119,6 +5119,11 @@ class Importvorlage extends GenImportvorlage {
$row['soll'] = $row['betrag']; $row['soll'] = $row['betrag'];
unset($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); $row['buchung'] = $this->app->erp->ReplaceDatum(true,$row['buchung'],false);
// Calculate hash // Calculate hash