| @@ -1,6 +1,6 @@ | |||||
| import pandas as pd | import pandas as pd | ||||
| from bank_parsers.helpers import parse_norwegian_date, convert_memo | |||||
| from bank_parsers.helpers import parse_norwegian_date, parse_norwegian_number, convert_memo | |||||
| def parse_sparebanken_norge(data): | def parse_sparebanken_norge(data): | ||||
| @@ -12,14 +12,13 @@ def parse_sparebanken_norge(data): | |||||
| for _, row in data.iterrows(): | for _, row in data.iterrows(): | ||||
| status = row.get('Status') | status = row.get('Status') | ||||
| cleared = status == "Bokført" | |||||
| reserved = status == "Reservert" | |||||
| if not (cleared or reserved): | |||||
| if pd.isna(status): | |||||
| continue | continue | ||||
| cleared = status == "Bokført" | |||||
| if row.get('Valuta') != 'NOK': | if row.get('Valuta') != 'NOK': | ||||
| raise ValueError(f"Unknown currency {row['Valuta']}") | |||||
| raise ValueError(f"Unknown currency {row['Valuta']} in row:\n{row}") | |||||
| payee = convert_memo(row.get('Beskrivelse', '')) | payee = convert_memo(row.get('Beskrivelse', '')) | ||||
| memo = convert_memo(row.get('Melding/KID/Fakt.nr', '')) | memo = convert_memo(row.get('Melding/KID/Fakt.nr', '')) | ||||
| @@ -30,8 +29,8 @@ def parse_sparebanken_norge(data): | |||||
| 'Date': parse_norwegian_date(date), | 'Date': parse_norwegian_date(date), | ||||
| 'Payee': payee, | 'Payee': payee, | ||||
| 'Memo': memo, | 'Memo': memo, | ||||
| 'Outflow': -float(row['Beløp ut'] or '0'), | |||||
| 'Inflow': float(row['Beløp inn'] or '0'), | |||||
| 'Outflow': -parse_norwegian_number(row['Beløp ut']) or 0, | |||||
| 'Inflow': parse_norwegian_number(row['Beløp inn']) or 0, | |||||
| 'Cleared': cleared, | 'Cleared': cleared, | ||||
| }) | }) | ||||