Ver código fonte

num_doc from input start

vnc-console 3 meses atrás
pai
commit
7970d64f1d

+ 4 - 2
py_mentor_imports/templates/monetars.txt

@@ -3,11 +3,12 @@ AnLucru={{ AnLucru }}
 LunaLucru={{ LunaLucru }}
 TipDocument=MONETAR
 TotalMonetare={{ TotalMonetare }}
+{% set ns = namespace(num_doc=FirstNrDoc) %}
 {% for document in documents %}
     [Monetar_{{ loop.index }}]
-    {% set num_doc = loop.index %}
+    {# % set num_doc = loop.index % #}
     Operat=D
-    NrDoc={{ num_doc }}
+    NrDoc={{ ns.num_doc }}
     SimbolCarnet=M
     Operatie=A
     CasaDeMarcat=D
@@ -21,4 +22,5 @@ TotalMonetare={{ TotalMonetare }}
     Observatii=Zi_fiscala-{{ document.zi_fiscala }} numar_bonuri-{{ document.numar_bonuri }} {# hgagfsfkhfff #}
     [Items_{{ loop.index }}]
     Item_1={{ Code }};BUC;1;{{ document.value }};DEPCENTR
+    {% set ns.num_doc = ns.num_doc + 1 %}
 {% endfor %}

+ 3 - 3
tests/test_monet_import.py

@@ -15,7 +15,7 @@ class Test(unittest.TestCase):
     templates = Environment(loader=PackageLoader('py_mentor_imports', 'templates'))
     template = templates.get_template('monetars.txt')
 
-    def test_monet(self):
+    def test_monet(self) -> None:
         path = r'f:\Gdrive\Misc\Dosar-Contabilitate\Ridewave\2024_04\raport_z\20240507213946_from_010424_to_300424__from_5_to_29.xlsx'
         df = pd.read_excel(path)
         df = df.drop(['Unnamed: 1', 'Unnamed: 2', 'Unnamed: 3',
@@ -27,12 +27,12 @@ class Test(unittest.TestCase):
         for zi, date, number, value in zip(df['1. Zi fiscala'], df['4. Data raport Z'], df['5. Numar\nbonuri'], df['6. Valoare\ntotala']):
             monetar = Monetar(zi_fiscala=zi, data_raport_z=date, numar_bonuri=number, value=value)
             monetars.append(monetar)
-
+        first_nr_doc: int = int(input('number of the first doc'))
         data = {'AnLucru': datetime.date.today().year,
                 'LunaLucru': get_last_month(1),
                 'TotalMonetare': len(df),
                 'documents': monetars,
-                # 'NrDoc': [],
+                'FirstNrDoc': first_nr_doc,
                 # 'NumarBonuri': [],
                 # 'Data': [],
                 # 'Observatii': [],

+ 8 - 8
tests/test_sale_invoice.py

@@ -16,7 +16,7 @@ class Test(unittest.TestCase):
     template = templates.get_template('bolt_sale_invoice.txt')
     template2 = templates.get_template('partners.txt')
 
-    def test_bolt_inv(self):
+    def test_bolt_inv(self) -> None:
         names = []
         codes = []
         values = []
@@ -33,22 +33,22 @@ class Test(unittest.TestCase):
                         texts.append(txt)
                         # print(texts)
                         buyer_name = re.search(r'[a-zA-Z0-9. ]*(?=\nRidewave SRL)', txt)
-                        buyer_code = re.search(r'(?<=Cod TVA: )[a-zA-Z0-9]*|(?<=Reg. code: )[a-zA-Z0-9]*', txt).group()
+                        buyer_code = re.search(r'(?<=Cod TVA: )[a-zA-Z0-9]*|(?<=Reg. code: )[a-zA-Z0-9]*', txt).group() # noqa E:if match None
                         if buyer_code == '49340170':
-                            buyer_code = input(f'enter code manually for {buyer_name.group()}')
+                            buyer_code = input(f'enter code manually for {buyer_name.group()}') # noqa E:if match None
 
                         total_value = re.search(r'(?<=otal \(RON\):\n)[a-zA-Z0-9.]*', txt)
                         doc_number = re.search(r'(?<=Factura nr. )[a-zA-Z\n0-9-]*|(?<=Invoice no. )[a-zA-Z\n0-9-]*', txt)
-                        doc_number = doc_number.group().strip().replace('\n', '')[-3:]
+                        doc_number = doc_number.group().strip().replace('\n', '')[-3:] # noqa E:if match None
                         doc_notes = re.search(r'(?<=Pornire: )[a-zA-Z \n,.\(\):0-9-]*|(?<=Start: )[a-zA-Z \n,.\(\):0-9-]*', txt)
-                        doc_notes = doc_notes.group().strip().replace('\n', '')
+                        doc_notes = doc_notes.group().strip().replace('\n', '') # noqa E:if match None
                         doc_data = re.search(r'(?<=Dată: )[0-9.]*|(?<=Date: )[0-9.]*', txt)
-                        names.append(buyer_name.group())
+                        names.append(buyer_name.group()) # noqa E:if match None
                         codes.append(buyer_code)
-                        values.append(total_value.group())
+                        values.append(total_value.group()) # noqa E:if match None
                         numbers.append(doc_number)
                         notes.append(doc_notes)
-                        dates.append(doc_data.group())
+                        dates.append(doc_data.group()) # noqa E:if match None
                         # print(total_value.group(), buyer_code.group(), doc_number)
         data = {'dates': dates, 'names': names, 'codes': codes, 'values': values, 'numbers': numbers, 'notes': notes}
         df = pd.DataFrame(data)