Browse Source

hardcode shedetname

vnc-console 1 year ago
parent
commit
3c65f18918
1 changed files with 7 additions and 10 deletions
  1. 7 10
      winmentor/dbread.py

+ 7 - 10
winmentor/dbread.py

@@ -265,11 +265,7 @@ class WinMentor(object):
                         yield bank_account
     
     def save_oblig(self, short_name):
-        #.......................................................................
-        # TO DO
-        # add moneda and curs
-        #.......................................................................
-        df_dicts = self.get_oblig(short_name)
+        df_dicts = self._get_oblig(short_name)
         # create dfs from dicts
         df_parts = pd.DataFrame(df_dicts[1])
         df_conts = pd.DataFrame(df_dicts[2])
@@ -300,14 +296,15 @@ class WinMentor(object):
         options = ['581', '455', '455.01', '167', '666']
         suppliers = ['401', '404', '409', '409.01', '409.02', '409.04']
         clients = ['411', '411.01', '419', '472']
-        df_obligall['TipPartener'] = df_obligall.apply(lambda row: self.part_type(row), axis=1)
+        df_obligall['TipPartener'] = df_obligall.apply(lambda row: self._part_type(row), axis=1)
         df_obligall['RestRon'] = df_obligall['Rest'] * df_obligall['Curs']
         mask = (~df_obligall['Simbol_x'].isin(options)) & (df_obligall['Rest'] != 0)
         df_obligsp = df_obligall.loc[mask & (df_obligall['Simbol_x'].isin(suppliers))]
         df_obligcl = df_obligall.loc[mask & (df_obligall['Simbol_x'].isin(clients))]
         print(df_obligall.head(10))
+        # prepare sheet
         writer = pd.ExcelWriter(
-            'obligatii.xlsx',
+            '{}.xlsx'.format(self._oblig_sheet_name),
             engine='xlsxwriter')
 
         df_obligsp.to_excel(writer, sheet_name='Furnizori', index=False)
@@ -330,9 +327,8 @@ class WinMentor(object):
         sh2.set_column('D:D', 10)
         sh2.set_column('G:G', 30)
         writer._save()
-        # writer.close()
     
-    def part_type(self, row):
+    def _part_type(self, row):
         suppliers = ['401', '403', '404', '408']
         adv_suppliers = ['409', '409.01', '409.02', '409.03', '409.04']
         clients = ['411', '411.01', '418']
@@ -347,7 +343,7 @@ class WinMentor(object):
             return 'Avans client'
         
         
-    def get_oblig(self, short_name, db_file='/ObligPI.DB'):
+    def _get_oblig(self, short_name, db_file='/ObligPI.DB'):
         firm_list = self.filtered_firmlist(None)
         oblig_headers = ['Part', 'TipDoc', 'Cont', 'Doc', 'Moneda', 'Curs', 'NrDoc', 'DataDoc', 'Valoare', 'Rest']
         obligf_headers = ['Part', 'TipTranz', 'Cont', 'Doc', 'Moneda', 'Curs', 'NrDoc', 'DataDoc', 'Valoare', 'Rest']
@@ -375,6 +371,7 @@ class WinMentor(object):
                 parts_dict = dbtodf_parts.convert_parts()
                 conts_dict = dbtodf_conts.convert_cont()
                 mons_dict = dbtodf_mons.convert_mon()
+                self._oblig_sheet_name = firm[0]
         return (oblig_dict, parts_dict, conts_dict, obligf_dict, mons_dict)
 
     def corp_list(self, name=None):