vnc-console il y a 3 mois
Parent
commit
6392d3ed4d
2 fichiers modifiés avec 59 ajouts et 59 suppressions
  1. 2 2
      pymt940/CSV2MentorBtrl.py
  2. 57 57
      pymt940/private.py

+ 2 - 2
pymt940/CSV2MentorBtrl.py

@@ -7,7 +7,7 @@ from pymt940.utils import (get_partners, re_check, dig_it, get_last_month, find_
 
 class PaymentsProcessorBtrl:
     def __init__(self, csv_path, partner_data, account_name=None, account_number=None,
-                 currency=None, account_location=None, account_agency=None, account_symbol=None):
+                 currency=None, account_location=None, account_agency=None, account_symbol=None) -> None:
         self.csv_path = csv_path
         self.partner_data = partner_data
         self._account_name = account_name
@@ -195,7 +195,7 @@ class PaymentsProcessorBtrl:
         self.type_list = {k: v for k, v in zip(days, types)}
         self.unique_count = unique_count
 
-    def to_dict(self, kind: str, month_back: int, std_client: str, acc_symbol: int):
+    def to_dict(self, kind: str, month_back: int, std_client: str, acc_symbol: float):
         kinds = ['TotalIncasari', 'TotalPlati']
         if kind not in kinds:
             raise TypeError(f'type not in {kinds}')

+ 57 - 57
pymt940/private.py

@@ -6,67 +6,67 @@
 # MZK = 'CONSDEN'
 # MZKCSV = 'RO26BTRL01301202N63584XX.csv'
 
-MZK = {'name': 'CONSDEN',
-       'accountron': {'name': 'CONT BTRL', 'number': 'RO26BTRL01301202N63584XX', 'currency': 'Lei'},
-       # 'accounteur': {'name': 'TRANSILVANIA EURO', 'number': 'RO95BTRL01304202A93957XX', 'currency': 'EUR'},
-       # 'accounthuf': {'name': 'TRANSILVANIA HUF', 'number': 'RO93BTRL01312202A93957XX', 'currency': 'HUF'},
-       'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ CIPARIU', 'symbol': 'BT',
-       'ron': 'RO26BTRL01301202N63584XX.csv',
-       # 'eur': 'RO95BTRL01304202A93957XX.csv',
-       # 'huf': 'RO93BTRL01312202A93957XX.csv'
-       }
+MZK: dict = {'name': 'CONSDEN',
+             'accountron': {'name': 'CONT BTRL', 'number': 'RO26BTRL01301202N63584XX', 'currency': 'Lei'},
+             # 'accounteur': {'name': 'TRANSILVANIA EURO', 'number': 'RO95BTRL01304202A93957XX', 'currency': 'EUR'},
+             # 'accounthuf': {'name': 'TRANSILVANIA HUF', 'number': 'RO93BTRL01312202A93957XX', 'currency': 'HUF'},
+             'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ CIPARIU', 'symbol': 'BT',
+             'ron': 'RO26BTRL01301202N63584XX.csv',
+             # 'eur': 'RO95BTRL01304202A93957XX.csv',
+             # 'huf': 'RO93BTRL01312202A93957XX.csv'
+             }
 
-VIBRO = {'name': 'VIBRO',
-         'accountron': {'name': 'BTRL RON-CARD-1225', 'number': 'RO23BTRL01301202A93957XX', 'currency': 'Lei'},
-         'accounteur': {'name': 'TRANSILVANIA EURO', 'number': 'RO95BTRL01304202A93957XX', 'currency': 'EUR'},
-         'accounthuf': {'name': 'TRANSILVANIA HUF', 'number': 'RO93BTRL01312202A93957XX', 'currency': 'HUF'},
-         'accountusd': {'name': 'TRANSILVANIA USD', 'number': 'RO86BTRLUSDCRT00A9395701', 'currency': 'USD'},
-         'location': 'Cluj-Napoca', 'agency': 'CLUJ-NAPOCA', 'symbol': 'BTRL',
-         'ron': 'RO23BTRL01301202A93957XX.csv',
-         'eur': 'RO95BTRL01304202A93957XX.csv',
-         'huf': 'RO93BTRL01312202A93957XX.csv',
-         'USD': 'RO86BTRLUSDCRT00A9395701.csv'}
+VIBRO: dict = {'name': 'VIBRO',
+               'accountron': {'name': 'BTRL RON-CARD-1225', 'number': 'RO23BTRL01301202A93957XX', 'currency': 'Lei'},
+               'accounteur': {'name': 'TRANSILVANIA EURO', 'number': 'RO95BTRL01304202A93957XX', 'currency': 'EUR'},
+               'accounthuf': {'name': 'TRANSILVANIA HUF', 'number': 'RO93BTRL01312202A93957XX', 'currency': 'HUF'},
+               'accountusd': {'name': 'TRANSILVANIA USD', 'number': 'RO86BTRLUSDCRT00A9395701', 'currency': 'USD'},
+               'location': 'Cluj-Napoca', 'agency': 'CLUJ-NAPOCA', 'symbol': 'BTRL',
+               'ron': 'RO23BTRL01301202A93957XX.csv',
+               'eur': 'RO95BTRL01304202A93957XX.csv',
+               'huf': 'RO93BTRL01312202A93957XX.csv',
+               'USD': 'RO86BTRLUSDCRT00A9395701.csv'}
 
-WEBS = {'name': 'WEBS',
-        'accountron': {'name': 'CONT CURENT', 'number': 'RO63OTPV200000241511RO01', 'currency': 'Lei'},
-        'accounteur': {'name': 'CONT EURO', 'number': 'RO20OTPV200000241511EU01', 'currency': 'EUR'},
-        'accountcard': {'name': 'CONT CARD', 'number': 'RO36OTPV200000241511RO02', 'currency': 'Lei'},
-        'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ NAPOCA', 'symbol': 'OTP',
-        'ron': 'RO63OTPV200000241511RO01.csv',
-        'eur': 'RO20OTPV200000241511EU01.csv',
-        'card': 'RO36OTPV200000241511RO02.csv'}
+WEBS: dict = {'name': 'WEBS',
+              'accountron': {'name': 'CONT CURENT', 'number': 'RO63OTPV200000241511RO01', 'currency': 'Lei'},
+              'accounteur': {'name': 'CONT EURO', 'number': 'RO20OTPV200000241511EU01', 'currency': 'EUR'},
+              'accountcard': {'name': 'CONT CARD', 'number': 'RO36OTPV200000241511RO02', 'currency': 'Lei'},
+              'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ NAPOCA', 'symbol': 'OTP',
+              'ron': 'RO63OTPV200000241511RO01.csv',
+              'eur': 'RO20OTPV200000241511EU01.csv',
+              'card': 'RO36OTPV200000241511RO02.csv'}
 
-CHRYS = {'name': 'CHRYPRI',
-         'accountron': {'name': 'CONT CURENT', 'number': 'RO60RNCB0106026590140001', 'currency': 'Lei'},
-         'accounteur': {'name': 'CONT EURO', 'number': 'RO16RNCB0106026590140017', 'currency': 'EUR'},
-         'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'BCR',
-         'ron': 'Extras BCR lei.csv',
-         'eur': 'Extras BCR Eur.csv'}
+CHRYS: dict = {'name': 'CHRYPRI',
+               'accountron': {'name': 'CONT CURENT', 'number': 'RO60RNCB0106026590140001', 'currency': 'Lei'},
+               'accounteur': {'name': 'CONT EURO', 'number': 'RO16RNCB0106026590140017', 'currency': 'EUR'},
+               'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'BCR',
+               'ron': 'Extras BCR lei.csv',
+               'eur': 'Extras BCR Eur.csv'}
 
-KKINV = {'name': 'KINVEST',
-         'accountron': {'name': 'BRD', 'number': 'RO57BRDE130SV79669811300', 'currency': 'Lei'},
-         'accounteur': {'name': 'EUR', 'number': 'RO63BRDE130SV65089621300', 'currency': 'EUR'},
-         'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ NAPOCA', 'symbol': 'BRD',
-         'ron': 'Extras BRD lei.zip',
-         'eur': 'Extras BRD Eur.zip'}
+KKINV: dict = {'name': 'KINVEST',
+               'accountron': {'name': 'BRD', 'number': 'RO57BRDE130SV79669811300', 'currency': 'Lei'},
+               'accounteur': {'name': 'EUR', 'number': 'RO63BRDE130SV65089621300', 'currency': 'EUR'},
+               'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ NAPOCA', 'symbol': 'BRD',
+               'ron': 'Extras BRD lei.zip',
+               'eur': 'Extras BRD Eur.zip'}
 
-TAURIMOB = {'name': 'TAURIMOB',
-            'accountron': {'name': 'CONT BT RON - 1167', 'number': 'RO04BTRLRONCRT0603497501', 'currency': 'Lei'},
-            'accounteur': {'name': '', 'number': '', 'currency': 'EUR'},
-            'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'TRANSILVANIA',
-            'ron': 'RO04BTRLRONCRT0603497501.csv',
-            'eur': ''}
+TAURIMOB: dict = {'name': 'TAURIMOB',
+                  'accountron': {'name': 'CONT BT RON - 1167', 'number': 'RO04BTRLRONCRT0603497501', 'currency': 'Lei'},
+                  'accounteur': {'name': '', 'number': '', 'currency': 'EUR'},
+                  'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'TRANSILVANIA',
+                  'ron': 'RO04BTRLRONCRT0603497501.csv',
+                  'eur': ''}
 
-DECOR = {'name': 'FEROTI',
-         'accountron': {'name': 'CONT CURENT BT LEI 1133 1125', 'number': 'RO54BTRL01301202I02674XX', 'currency': 'Lei'},
-         'accounteur': {'name': 'CONT CURENT VALUTA EURO', 'number': 'RO29BTRL01304202I02674XX', 'currency': 'EUR'},
-         'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ', 'symbol': 'BT',
-         'ron': 'RO54BTRL01301202I02674XX.csv',
-         'eur': 'RO29BTRL01304202I02674XX.csv'}
+DECOR: dict = {'name': 'FEROTI',
+               'accountron': {'name': 'CONT CURENT BT LEI 1133 1125', 'number': 'RO54BTRL01301202I02674XX', 'currency': 'Lei'},
+               'accounteur': {'name': 'CONT CURENT VALUTA EURO', 'number': 'RO29BTRL01304202I02674XX', 'currency': 'EUR'},
+               'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ', 'symbol': 'BT',
+               'ron': 'RO54BTRL01301202I02674XX.csv',
+               'eur': 'RO29BTRL01304202I02674XX.csv'}
 
-RIDEW = {'name': 'RIDEW',
-         'accountron': {'name': 'BTRL RON', 'number': 'RO69BTRLRONCRT0CP9775401', 'currency': 'Lei'},
-         'accounteur': {'name': '', 'number': '', 'currency': 'EUR'},
-         'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'TRANSILVANIA',
-         'ron': 'RO69BTRLRONCRT0CP9775401.csv',
-         'eur': ''}
+RIDEW: dict = {'name': 'RIDEW',
+               'accountron': {'name': 'BTRL RON', 'number': 'RO69BTRLRONCRT0CP9775401', 'currency': 'Lei'},
+               'accounteur': {'name': '', 'number': '', 'currency': 'EUR'},
+               'location': 'CLUJ-NAPOCA', 'agency': 'CLUJ-NAPOCA', 'symbol': 'TRANSILVANIA',
+               'ron': 'RO69BTRLRONCRT0CP9775401.csv',
+               'eur': ''}