radboy 0.0.611__py3-none-any.whl → 0.0.613__py3-none-any.whl

radboy/DB/OrderedAndRxd.py

@@ -229,6 +229,9 @@ class OrderAndRxdUi():
                         pass
                 else:
                     filte.append(getattr(OrderedAndRecieved,k)==src_dict[k])
+        #uncomment these to troubleshoot
+        #print('x3',and_(*filte))
+        #print('x4')
         return and_(*filte)
 
     def OrderedAndRecieved_as(self,_exlcudes=[],as_=None,item=None):
@@ -316,7 +319,7 @@ class OrderAndRxdUi():
 
         if terms is not None:
             with Session(ENGINE) as session:
-                query=session.query(OrderedAndRecieved).filter(*terms)
+                query=session.query(OrderedAndRecieved).filter(terms)
                 query=orderQuery(query,OrderedAndRecieved.dtoe)
                 results=query.all()
                 ct=len(results)

radboy/TasksMode/SetEntryNEU.py

@@ -355,6 +355,7 @@ class NEUSetter:
                     tax_adjusted=False
                     for fname in fnames:
                         column=getattr(Entry,fname)
+                        oldprice=getattr(selected,'Price')
                         newValue=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"[{Fore.medium_violet_red}old{Fore.light_yellow}] {Fore.light_magenta}{fname} = {Fore.light_red}{getattr(selected,fname)}{Fore.orange_red_1} to: {Style.reset}",helpText="new value",data=str(column.type))
                         if newValue in [None,'d']:
                             continue
@@ -367,16 +368,25 @@ class NEUSetter:
                         if fname.lower() == 'price':
                             session.commit()
                             session.refresh(selected)
-                            adjust_tax=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Adjust Tax using Price({newValue}),CRV({selected.CRV}), and the Tax Rate",helpText="yes/no/boolean",data="boolean")
+                            adjust_tax=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Adjust Tax using Price({newValue}),CRV({selected.CRV}), and the Tax Rate.",helpText="yes/no/boolean",data="boolean")
                             if adjust_tax in ['d',True]:
                                 tax_adjusted=True
                                 ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
                                 default_taxrate=round(float(db.detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True)),4)
-                                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax({default_taxrate}): ",helpText=f"What is the tax rate, default is {default_taxrate}.",data="float")
+                                
+                                try:
+                                    last_taxrate=float(decc(selected.Tax/(oldprice+selected.CRV),cf=4))
+                                except Exception as e:
+                                    print(e)
+                                    last_taxrate=0
+
+                                tax_rate=Prompt.__init2__(None,func=lambda text,data:FormBuilderMkText(text,data,passThru=['l','L','last'],PassThru=True),ptext=f"Tax(default={default_taxrate},{Fore.light_green}{['l','L','last']}{Fore.dark_goldenrod}last_tax_rate={Fore.light_red}{last_taxrate}{Fore.light_yellow}): ",helpText=f"What is the tax rate, default is {default_taxrate}; just hit enter.['l','L','last'] will use last taxrate {last_taxrate}.",data="float")
                                 if tax_rate in [None,]:
                                     return selected.Tax,selected.CRV
                                 elif tax_rate in ['d',]:
                                     tax_rate=default_taxrate
+                                elif tax_rate in ['l','L','last']:
+                                    tax_rate=last_taxrate
 
                                 tax=round(selected.Price+selected.CRV,ROUNDTO)*tax_rate
                                 tax=round(tax,ROUNDTO)

radboy/TasksMode/Tasks.py

@@ -3625,7 +3625,7 @@ result in setting the value to 'Default Qty'+'Location Field'{Style.reset}
                     return tax,crv
                 elif crv in ['d',]:
                     crv=0
-                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax({default_taxrate}): ",helpText=f"What is the tax rate, default is {default_taxrate}.",data="float")
+                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax({default_taxrate}: ",helpText=f"What is the tax rate, default is {default_taxrate}.",data="float")
                 if tax_rate is None:
                     return tax,crv
                 elif tax_rate in ['d',]:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.611'
+VERSION='0.0.613'

{radboy-0.0.611.dist-info → radboy-0.0.613.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.611
+Version: 0.0.613
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.611.dist-info → radboy-0.0.613.dist-info}/RECORD

@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=apxrQSRxmd1alDbnjlQBGaTedJ9lSHNV9SBz236CUZo,17
+radboy/__init__.py,sha256=h8M7_cIU6MZ9hUaQMnFKaH-R1xkPYjsUtXVjrCIUKCk,17
 radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
 radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
@@ -83,7 +83,7 @@ radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
 radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
-radboy/DB/OrderedAndRxd.py,sha256=pjEfQ8dyiG2kFurGtAKjXPCRLrSU16acmoxquCIS9ZE,16591
+radboy/DB/OrderedAndRxd.py,sha256=AHXlrRb7BuLLMI35VCfCr9NARBgQZXyAkMobClUJ0Ns,16686
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -344,17 +344,17 @@ radboy/SystemSettings/__pycache__/SystemSettings.cpython-313.pyc,sha256=ddGbkpJe
 radboy/SystemSettings/__pycache__/__init__.cpython-312.pyc,sha256=aIzp4Po0t8EhSAE8ytO-tJlNuKnEzAWPi1fzEIoGesI,277
 radboy/SystemSettings/__pycache__/__init__.cpython-313.pyc,sha256=QFDuoidxMWsGVLsy5lN-rDs6TP8nKJ4yyCyiamNOhwo,156
 radboy/TasksMode/ReFormula.py,sha256=REDRJYub-OEOE6g14oRQOLOQwv8pHqVJy4NQk3CCM90,2255
-radboy/TasksMode/SetEntryNEU.py,sha256=i4HyPq-LNDRwYN-q_CpZDAdzipe9Dx5TWeaXRCdX79k,19818
-radboy/TasksMode/Tasks.py,sha256=S6YND8dyUuSqR0x3eFi4KX2h0fMQFbJsqbaH0gays9k,343181
+radboy/TasksMode/SetEntryNEU.py,sha256=mkV9zAZe0lfpu_3coMuIILEzh6PgCNi7g9lJ4yDUpYM,20596
+radboy/TasksMode/Tasks.py,sha256=d2vmzH1oOy5-2-bxlJpDNEan9klH1bl8xLv9I8wp42I,343180
 radboy/TasksMode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/TasksMode/__pycache__/ReFormula.cpython-311.pyc,sha256=QEG3PwVw-8HTd_Mf9XbVcxU56F1fC9yBqWXYPLC39DU,4865
 radboy/TasksMode/__pycache__/ReFormula.cpython-312.pyc,sha256=aX7BWm2PPjCTnxsbGUitR-2h9hq4AjaBiHMrUXvIl0Y,3967
 radboy/TasksMode/__pycache__/ReFormula.cpython-313.pyc,sha256=BfNrg6vlQn5f2asq3gT7JVYC0sOLmYqQyuBPTGJXPNk,3901
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6SvZZ4jUfWJulvDbKue4HGFTIeteOU,17671
-radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=XFHp4zFZKm7bREkoR9QB1Z6AzuFxW0-yRkGaSSyRTb0,23533
+radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=jMSrUX9pvEhf67uVwrPE2ZlBCems8V7tHJ1LcC15ovU,24603
 radboy/TasksMode/__pycache__/Tasks.cpython-311.pyc,sha256=6QOTJnLiXSKdF81hkhy3vyrz49PPhS20s5_0X52g3Hw,131120
 radboy/TasksMode/__pycache__/Tasks.cpython-312.pyc,sha256=hyJwdaYaaRLdcrNxgg36diJ5iijX5_3I0UAORsj-6LU,310295
-radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=XIxKS-1jXT4Rqv3N_nNo39dFnjKq9Q5KYQ_ZtSiANSg,417894
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=BWDbB8ind3Xe-FO4WlY6uoLnzSL6mXnzxDxJFeDBkRM,417894
 radboy/TasksMode/__pycache__/__init__.cpython-311.pyc,sha256=PKV1JbihEacm639b53bZozRQvcllSkjGP3q8STVMxF4,234
 radboy/TasksMode/__pycache__/__init__.cpython-312.pyc,sha256=ERgnEvRMiGSecWp1BpNzLdSq_SdKw7GvFWUvUM7bLVw,272
 radboy/TasksMode/__pycache__/__init__.cpython-313.pyc,sha256=lvsTxukyvGKB3C0rdF9dQi_bvVh6ceDVINfwcuIsd0s,151
@@ -401,7 +401,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
 radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
 radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
 radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
-radboy/__pycache__/__init__.cpython-313.pyc,sha256=hCi-HYyWc942R1Kq43Wjs3SEnNOfHpnEt2oP9MnnlKw,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=3BAhNSWwsIUkmwcvWidjgKJ2FlWacl4bhQMuKR8H5GA,165
 radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
 radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
 radboy/__pycache__/possibleCode.cpython-312.pyc,sha256=tk_CO-AcsO3YZj5j6vEsw3g37UmEzWc5YgeWEoJEUg4,27922
@@ -429,7 +429,7 @@ radboy/tkGui/Images/__pycache__/__init__.cpython-311.pyc,sha256=tXBYpqbOlZ24B1BI
 radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
 radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
 radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
-radboy-0.0.611.dist-info/METADATA,sha256=GrjDG4zg4m8aJmPu78x80bAzLEz3QSDH_9dIm-qxAas,1662
-radboy-0.0.611.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.611.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.611.dist-info/RECORD,,
+radboy-0.0.613.dist-info/METADATA,sha256=2iPGI586b_OI14LwLGSccTzACZzAks7MFrwZCwMecic,1662
+radboy-0.0.613.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.613.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.613.dist-info/RECORD,,