deeejas 1 year ago
parent
commit
dc1d8d8d81
2 changed files with 25 additions and 20 deletions
  1. 16 11
      winmentor/dbread.py
  2. 9 9
      winmentor/tax_mailer.py

+ 16 - 11
winmentor/dbread.py

@@ -241,11 +241,11 @@ class WinMentor(object):
         return month_folders[0]
         return month_folders[0]
 
 
     def get_bank_accounts(self, short_name, db_file='/nbanca.db'):
     def get_bank_accounts(self, short_name, db_file='/nbanca.db'):
-        #.......................................................................
+        # .......................................................................
         # TO DO: put an all_ parameter to yield all_ accounts or
         # TO DO: put an all_ parameter to yield all_ accounts or
         # just one,
         # just one,
         # make a named tuple with bank accounts.
         # make a named tuple with bank accounts.
-        #.......................................................................
+        # .......................................................................
         headers = ['Codbanca', 'Denumire', 'NrCont']
         headers = ['Codbanca', 'Denumire', 'NrCont']
         headers2 = ['COD', 'DENUMIRE']
         headers2 = ['COD', 'DENUMIRE']
         short_name = self.winment_path + short_name
         short_name = self.winment_path + short_name
@@ -264,7 +264,7 @@ class WinMentor(object):
                     bank_account.append(bank_codes[bank_account[0]])
                     bank_account.append(bank_codes[bank_account[0]])
                     if bank_account[2].startswith(' '):
                     if bank_account[2].startswith(' '):
                         yield bank_account
                         yield bank_account
-    
+
     def save_oblig(self, short_name):
     def save_oblig(self, short_name):
         df_dicts = self._get_oblig(short_name)
         df_dicts = self._get_oblig(short_name)
         # create dfs from dicts
         # create dfs from dicts
@@ -331,7 +331,7 @@ class WinMentor(object):
         sh.set_column('L:L', 12, cell_format=num_format)
         sh.set_column('L:L', 12, cell_format=num_format)
         sh.set_column('D:D', 10)
         sh.set_column('D:D', 10)
         sh.set_column('G:G', 30)
         sh.set_column('G:G', 30)
-        sh.conditional_format('A2:L500', {'type':'formula', 'criteria':'=NOT($G3=$G2)', 'format':b_format})
+        sh.conditional_format('A2:L500', {'type': 'formula', 'criteria': '=NOT($G3=$G2)', 'format': b_format})
         sh2 = workbook.get_worksheet_by_name('Clienti')
         sh2 = workbook.get_worksheet_by_name('Clienti')
         sh2.freeze_panes(1, 0)
         sh2.freeze_panes(1, 0)
         sh2.autofilter('A1:N500')
         sh2.autofilter('A1:N500')
@@ -339,9 +339,9 @@ class WinMentor(object):
         sh2.set_column('L:L', 12, cell_format=num_format)
         sh2.set_column('L:L', 12, cell_format=num_format)
         sh2.set_column('D:D', 10)
         sh2.set_column('D:D', 10)
         sh2.set_column('G:G', 30)
         sh2.set_column('G:G', 30)
-        sh2.conditional_format('A2:L500', {'type':'formula', 'criteria':'=NOT($G3=$G2)', 'format':b_format})
+        sh2.conditional_format('A2:L500', {'type': 'formula', 'criteria': '=NOT($G3=$G2)', 'format': b_format})
         writer._save()
         writer._save()
-    
+
     def _part_type(self, row):
     def _part_type(self, row):
         suppliers = ['401', '403', '404', '408']
         suppliers = ['401', '403', '404', '408']
         adv_suppliers = ['409', '409.01', '409.02', '409.03', '409.04']
         adv_suppliers = ['409', '409.01', '409.02', '409.03', '409.04']
@@ -450,7 +450,7 @@ class WinMentor(object):
 
 
     def an_inc(self, account_list, boolind, ind2, ind3):
     def an_inc(self, account_list, boolind, ind2, ind3):
         '''returns the annual turnover in given year
         '''returns the annual turnover in given year
-        
+
         :param int boolind:account class number
         :param int boolind:account class number
         :param int ind2, ind3:debit or credit position in balance
         :param int ind2, ind3:debit or credit position in balance
         (6-rulaj curent debit, 8-rulaj cumulat debit, index starting from 0)'''
         (6-rulaj curent debit, 8-rulaj cumulat debit, index starting from 0)'''
@@ -543,8 +543,10 @@ class WinMentor(object):
         for acc in account_list:
         for acc in account_list:
             p = acc[1] == acc_1
             p = acc[1] == acc_1
             d = acc[1] == acc_2
             d = acc[1] == acc_2
-            if p: CAS += acc[8]
-            if d: CAS += acc[8]
+            if p:
+                CAS += acc[8]
+            if d:
+                CAS += acc[8]
         return round(CAS)
         return round(CAS)
 
 
     def CASS_payable(self, account_list, accounts=('431.04', '431.06')) -> int:
     def CASS_payable(self, account_list, accounts=('431.04', '431.06')) -> int:
@@ -555,8 +557,10 @@ class WinMentor(object):
         for acc in account_list:
         for acc in account_list:
             p = acc[1] == acc_1
             p = acc[1] == acc_1
             d = acc[1] == acc_2
             d = acc[1] == acc_2
-            if p: CASS += acc[8]
-            if d: CASS += acc[8]
+            if p:
+                CASS += acc[8]
+            if d:
+                CASS += acc[8]
         return round(CASS)
         return round(CASS)
 
 
     def sal_tax_payable(self, account_list, account='431.44') -> int:
     def sal_tax_payable(self, account_list, account='431.44') -> int:
@@ -718,6 +722,7 @@ class WinMentor(object):
             #     tt -= account.soldf('d')
             #     tt -= account.soldf('d')
         return round(tt)
         return round(tt)
 
 
+
 if __name__ == '__main__':
 if __name__ == '__main__':
     mentor = WinMentor()
     mentor = WinMentor()
     # accounts = list(mentor.get_bank_accounts('WEBS'))
     # accounts = list(mentor.get_bank_accounts('WEBS'))

+ 9 - 9
winmentor/tax_mailer.py

@@ -13,7 +13,7 @@ class M_mailer(object):
     mentor_date = (D.today() - 1 * months - 5 * days).strftime('%Y_%m')
     mentor_date = (D.today() - 1 * months - 5 * days).strftime('%Y_%m')
     templates = Environment(loader=PackageLoader('winmentor', 'templates'))
     templates = Environment(loader=PackageLoader('winmentor', 'templates'))
     template = templates.get_template('body.html')
     template = templates.get_template('body.html')
-    
+
     @staticmethod
     @staticmethod
     def get_vat_period(vat_text):
     def get_vat_period(vat_text):
         if vat_text == 'TVA-1':
         if vat_text == 'TVA-1':
@@ -23,7 +23,7 @@ class M_mailer(object):
         else:
         else:
             ret = 'Neplatitor de TVA'
             ret = 'Neplatitor de TVA'
         return ret
         return ret
-    
+
     @staticmethod
     @staticmethod
     def get_tax_type(tax_text):
     def get_tax_type(tax_text):
         if tax_text == 'IMP-1':
         if tax_text == 'IMP-1':
@@ -35,19 +35,19 @@ class M_mailer(object):
         else:
         else:
             ret = ''
             ret = ''
         return ret
         return ret
-    
+
     @staticmethod
     @staticmethod
     def due_date():
     def due_date():
         weekend = ['Saturday', 'Sunday']
         weekend = ['Saturday', 'Sunday']
-        d_date = (25/M[D.today().month]/D.today().year)
+        d_date = (25 / M[D.today().month] / D.today().year)
         if d_date.strftime('%A') in weekend:
         if d_date.strftime('%A') in weekend:
-            d_date = (25/M[D.today().month]/D.today().year) + MO
+            d_date = (25 / M[D.today().month] / D.today().year) + MO
         return d_date.strftime('%d-%m-%Y')
         return d_date.strftime('%d-%m-%Y')
-    
+
     @property
     @property
     def body(self):
     def body(self):
         return self._body
         return self._body
-    
+
     def tax_mailer(self, mentor_list: list,
     def tax_mailer(self, mentor_list: list,
                    mail_dict: dict,
                    mail_dict: dict,
                    mentor: WinMentor,
                    mentor: WinMentor,
@@ -101,10 +101,10 @@ class M_mailer(object):
                                 'due_date': M_mailer.due_date()}
                                 'due_date': M_mailer.due_date()}
                         body = M_mailer.template.render(data)
                         body = M_mailer.template.render(data)
                         self._body = body
                         self._body = body
-                        tax = Taxes(name=name, vat=vat, vat_final=vat_final,contribs=contr,
+                        tax = Taxes(name=name, vat=vat, vat_final=vat_final, contribs=contr,
                                     cam=cam, income_tax=tax_payable, dividend_tax=div_tax,
                                     cam=cam, income_tax=tax_payable, dividend_tax=div_tax,
                                     return_=an_inc, result=result, tax_type=tax_type, period=M_mailer.mentor_date)
                                     return_=an_inc, result=result, tax_type=tax_type, period=M_mailer.mentor_date)
                         taxes.append(tax)
                         taxes.append(tax)
                         if send:
                         if send:
                             yag.send(to=contact['mail'], subject='Great!', contents=body)
                             yag.send(to=contact['mail'], subject='Great!', contents=body)
-        return taxes               
+        return taxes