radboy 0.0.585__tar.gz → 0.0.587__tar.gz

{radboy-0.0.585 → radboy-0.0.587}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.585
+Version: 0.0.587
 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.587/STDOUT.TXT

@@ -0,0 +1,10 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"h"
+#USER INPUT# -> :"bld crv ntx"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.587"

{radboy-0.0.585 → radboy-0.0.587}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.585"
+version = "0.0.587"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.585 → radboy-0.0.587}/radboy/DB/Prompt.py

@@ -1083,6 +1083,20 @@ class Prompt(object):
                             or_(db.Entry.CRV==None,db.Entry.CRV==0),
                             )
                             )
+                    elif db.BooleanAnswers.setFieldInList_MODES[mode] =='CRV_UNTAXED':
+                        results_query=results_query.filter(
+                            and_(
+                            or_(db.Entry.Tax==None,db.Entry.Tax==0),
+                            not_(or_(db.Entry.CRV==None,db.Entry.CRV==0)),
+                            )
+                            )
+                    elif db.BooleanAnswers.setFieldInList_MODES[mode] =='NO_CRV_TAXED':
+                        results_query=results_query.filter(
+                            and_(
+                            not_(or_(db.Entry.Tax==None,db.Entry.Tax==0)),
+                            or_(db.Entry.CRV==None,db.Entry.CRV==0),
+                            )
+                            )
 
                     location_fields=["Shelf","BackRoom","Display_1","Display_2","Display_3","Display_4","Display_5","Display_6","ListQty","SBX_WTR_DSPLY","SBX_CHP_DSPLY","SBX_WTR_KLR","FLRL_CHP_DSPLY","FLRL_WTR_DSPLY","WD_DSPLY","CHKSTND_SPLY","Distress"]
                     z=Prompt.mkfield_list(None,location_fields)
@@ -1230,19 +1244,19 @@ class Prompt(object):
                             print(db.strip_colors(msg))
                         else:
                             msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
-    {Fore.light_magenta}Price({Decimal(i.Price):.{getcontext().prec}f}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price)*total:.{getcontext().prec}f}
-    {Fore.grey_70}+CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
-     {Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv:.{getcontext().prec}f})+TotalPrice({total*Decimal(i.Price):.{getcontext().prec}f})
-     {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+crv:.{getcontext().prec}f}){Style.reset}
-    {Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/o CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
-     {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxNoCRVTotal({tax:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
-     {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax:.{getcontext().prec}f}){Style.reset}
-    {Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/ CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
-     {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
-     {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax+crv:.{getcontext().prec}f}){Style.reset}
-    {Fore.medium_violet_red}PercentOfTotal({super_total:.{getcontext().prec}f}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
-    {Fore.orange_red_1}TaxRate({taxRate:.{getcontext().prec}f})={Decimal(taxRate*100):.{getcontext().prec}f}%{Style.reset}
-    {'*'*os.get_terminal_size().columns}{Style.reset}"""
+{Fore.light_magenta}Price({Decimal(i.Price):.{getcontext().prec}f}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price)*total:.{getcontext().prec}f}
+{Fore.grey_70}+CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+{Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv:.{getcontext().prec}f})+TotalPrice({total*Decimal(i.Price):.{getcontext().prec}f})
+{Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+crv:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/o CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+{Fore.medium_spring_green}= {Fore.slate_blue_1}TaxNoCRVTotal({tax:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
+{Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/ CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+{Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
+{Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax+crv:.{getcontext().prec}f}){Style.reset}
+{Fore.medium_violet_red}PercentOfTotal({super_total:.{getcontext().prec}f}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
+{Fore.orange_red_1}TaxRate({taxRate:.{getcontext().prec}f})={Decimal(taxRate*100):.{getcontext().prec}f}%{Style.reset}
+{'*'*os.get_terminal_size().columns}{Style.reset}"""
                         if bldlse:
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                         if not justCount and not justTotal:
@@ -2342,10 +2356,14 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_70}**{Fore.light_green}s{Fore.light_red}bld{Fore.light_steel_blue} - search with barcode in all items with InList==True and has a location value above {Fore.light_red}0{Style.reset}
 {Fore.grey_70}**{Fore.light_green}"bldlse","builde","buildlse","build list export ","bld ls exp",'elsbld','export list build','exp ls bld','ebld'{Fore.light_steel_blue} - same as versions without export, but dumps list to {Path(Prompt.bld_file).absolute()}{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'esbld','export search build','export_search_build','exp scan build','exp_scan_bld'{Fore.light_steel_blue} - same as versions without export, but dumps list to {Path(Prompt.bld_file).absolute()}{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls crv","buildcrv","buildlscrv","build list crv","bld ls crv",'lsbld','list build crv','ls bld crv','bldcrv'{Fore.light_steel_blue} - bldls but on display Entries 'CRV' where has been applied.{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls tax","buildtax","buildlstax","build list tax","bld ls tx",'lsbldtx','list build tax','ls bld tx','bldtx'{Fore.light_steel_blue} - bldls but on display Entries 'Tax' where has been applied.{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls no txcrv","build no tax crv","buildlsnotaxcrv","build list no tax crv","bld ls ntxcrv",'lsbldntxcrv','list build no tax crv','ls bld ntx crv','bldntxcrv'{Fore.light_steel_blue} - bldls but on display Entries where no tax and no crv has been applied{Style.reset}
+
+{Fore.grey_70}**{Fore.light_green}{','.join(generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["ncrvtxd","nocrv txd","ncrv txd","no crv taxed"]))}{Fore.light_steel_blue} - bldls but displays Entries where 'Tax' has been applied, but no CRV has been applied.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{','.join(generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["crvntx","crv ntx","crv notax","crv not taxed","crv untaxed"]))}{Fore.light_steel_blue} - bldls but displays Entries where 'CRV' has been applied and where there is No tax.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls no txcrv","build no tax crv","buildlsnotaxcrv","build list no tax crv","bld ls ntxcrv",'lsbldntxcrv','list build no tax crv','ls bld ntx crv','bldntxcrv'{Fore.light_steel_blue} - bldls but displays Entries where no tax and no crv has been applied{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls crv","buildcrv","buildlscrv","build list crv","bld ls crv",'lsbld','list build crv','ls bld crv','bldcrv'{Fore.light_steel_blue} - bldls but displays Entries where 'CRV' where has been applied, regardless of taxed value.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls tax","buildtax","buildlstax","build list tax","bld ls tx",'lsbldtx','list build tax','ls bld tx','bldtx'{Fore.light_steel_blue} - bldls but displays Entries 'Tax' where has been applied,regardless of crv value.{Style.reset}
 {Fore.grey_70}**{Fore.light_green}"bldls showall","build showall","buildlssa","build list sa","bld ls sa",'lsbldsa','list build showall','ls bld sa','bld sa'{Fore.light_steel_blue} - bldls skipping the mode prompt to list all{Style.reset}
+
 {Fore.orange_red_1}**{Fore.grey_50}Add a {Fore.light_magenta}-{Fore.grey_50} to the end of each cmd to include negatives, but ignore '0' and 'None' if spaces are included then put a space before the last -, elsewise put a it immediately behind the cmd to to enable this feature{Style.reset}
 {Fore.grey_70}**{Fore.light_green}es{Fore.light_red}u{Fore.light_steel_blue} - search entry menu{Style.reset}
 {Fore.grey_70}**{Fore.light_green}tv{Fore.light_red}u{Fore.light_steel_blue} - show tag data info{Style.reset}
@@ -2790,7 +2808,10 @@ which will result in a cmd of 'ls Shelf'{Style.reset}
                         bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('NO_CRV_NO_TAX'))                        
                     elif cmd.lower() in ["bldls showall","build showall","buildlssa","build list sa","bld ls sa",'lsbldsa','list build showall','ls bld sa','bld sa']:
                         bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('SHOWALL'))                        
-
+                    elif cmd.lower() in generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["ncrvtxd","nocrv txd","ncrv txd","no crv taxed"]):
+                        bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('NO_CRV_TAXED'))  
+                    elif cmd.lower() in generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["crvntx","crv ntx","crv notax","crv not taxed","crv untaxed"]):
+                        bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('CRV_UNTAXED'))  
                     elif cmd.lower() in ['si-reference','si-ref','si ref','si reference']:
                         msg=f"""{Fore.light_steel_blue}{Style.bold}
 Name    Symbol  Factor/Scientific   Name

{radboy-0.0.585 → radboy-0.0.587}/radboy/DB/db.py

@@ -254,7 +254,7 @@ class BOOLEAN_ANSWERS:
         'UnitsDeep',
         'UnitsHigh',
         ]
-        self.setFieldInList_MODES=['SHOWALL','ONLY_SHOW_CRV','ONLY_SHOW_TAXED','NO_CRV_NO_TAX']
+        self.setFieldInList_MODES=['SHOWALL','ONLY_SHOW_CRV','ONLY_SHOW_TAXED','NO_CRV_NO_TAX','CRV_UNTAXED','NO_CRV_TAXED']
         self.HealthLogZip=Path("HealthLog.zip")
         self.IllegalCharsManifest=Path("IllegalCharsManifest.txt")
         self.yes=generate_cmds(startcmd=['y','Y','YES','1','t','true','TRUE','True'],endCmd=['',' '])

radboy-0.0.587/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.587'

{radboy-0.0.585 → radboy-0.0.587}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.585
+Version: 0.0.587
 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.585 → radboy-0.0.587}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.585"
+VERSION="0.0.587"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.585/STDOUT.TXT

@@ -1,29 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"bld sa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"bldtx"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"bldcrv"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"bldntcrv"
-#USER INPUT# -> :""
-#USER INPUT# -> :"bldntxcr"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"bldntxcrv"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"0.0.585"

radboy-0.0.585/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.585'