radboy 0.0.411__py3-none-any.whl → 0.0.412__py3-none-any.whl

radboy/DB/Prompt.py

@@ -951,17 +951,19 @@ class Prompt(object):
 
                     crv+=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
                     tax+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)
-                    if tax == 0 and crv > 0:
-                        tax_crv=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
-                    else:
-                        tax_crv+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)+(Decimal(i.CRV).quantize(Decimal("0.00")*total))
+
+                    tax_crv=(crv+tax)
                     master_total_tax+=tax
                     master_total_crv+=crv
                     master_total_tax_crv+=tax_crv
                     #print("#exegen",type(total),type(tax_crv))
                     try:
+                        print((total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv),"s1")
+                        print(Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00")),"s2")
+                        print(tax_crv,"s3")
                         #super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                        super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']*100).quantize(Decimal("100.1500"))
+                        super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00"))
+                        super_total=super_total*100
                     except Exception as e:
                         p1=total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv
                         p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.00"))
@@ -971,11 +973,12 @@ class Prompt(object):
                         super_total=0
                     #print("#exegen2")
                     super_total=Decimal(super_total).quantize(Decimal("0.00"))
+                    print(super_total)
                     msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
 {Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.00"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.00"))*total}
 {Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+crv})
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax})
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({total*i.Price})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({total*i.Price})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv})
 {Fore.medium_violet_red}PercentOfTotal({super_total}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                     if bldlse:
@@ -990,8 +993,8 @@ class Prompt(object):
                 
                 msg=f"""{Fore.light_green}Total Product Value:{Fore.slate_blue_1}{master_total}
 {Fore.light_green}Total Product Value w/CRV({master_total_crv}):{Fore.slate_blue_1}{master_total_crv+master_total}
-{Fore.light_green}Total Product Value Taxed w/o CRV({master_total_tax}):{Fore.slate_blue_1}{master_total_tax+master_total}
-{Fore.light_green}Total Product Value Taxed w/ CRV({master_total_tax_crv}):{Fore.slate_blue_1}{actual}
+{Fore.light_green}Total Product Value Taxed({master_total_tax}) w/o CRV({master_total_crv}):{Fore.slate_blue_1}{master_total_tax+master_total}
+{Fore.light_green}Total Product Value Taxed({master_total_tax}) w/ CRV({master_total_crv}):{Fore.slate_blue_1}{actual}
                 {Style.reset}"""
                 if bldlse:
                     db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.411'
+VERSION='0.0.412'

{radboy-0.0.411.dist-info → radboy-0.0.412.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.411
+Version: 0.0.412
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.411.dist-info → radboy-0.0.412.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=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=5CZXNtA9G1pUHhKTBwU5MLlNRULmg3vJOtg-59oifiw,17
+radboy/__init__.py,sha256=rVi0UiOao0iG2agEz5KarI9zOlqaVpYR8LwK1-cQcc4,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/ExerciseTracker.py,sha256=CZ8jdKJiAE_QTAiJTRXi8ZOnS1NUiSvWVSKLHLpYVGk,
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-radboy/DB/Prompt.py,sha256=s3Hy1OMTAxnvtjp2VH2crCU9SsmxS368l89bO1qa-WA,128482
+radboy/DB/Prompt.py,sha256=pb8SdWgkA3wz5kpasTVTtFEwI6Ljn59x0CwnZaa9xf0,128605
 radboy/DB/RandomStringUtil.py,sha256=eZCpR907WStgfbk4Evcghjv9hOkUDXH-iMXIq0-kXq8,24386
 radboy/DB/ResetTools.py,sha256=RbI-Ua7UlsN0S9qLqtEkTWvzyTZ6R-hHR3CW4NHlUPE,6660
 radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,4013
@@ -107,7 +107,7 @@ radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
 radboy/DB/__pycache__/Prompt.cpython-312.pyc,sha256=6CcQ1gE2hcz3cKPjo4f6d7xNM2PTDnl8NzQG0Pme5BE,142886
-radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=9g5Z1qptN5fAostIMgKTt08FoqB-SPXIQX_nnDd_WoE,200027
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=sb3HI4LLJsA6F5OtHK-XKip1w-K8kamFqnSg9OFCq4s,200238
 radboy/DB/__pycache__/RandomStringUtil.cpython-312.pyc,sha256=TrbEY89MuLmNlvoo5d8vOE6Dyshh5_EMlTZvk8MDVN4,48597
 radboy/DB/__pycache__/RandomStringUtil.cpython-313.pyc,sha256=MCcgVwV2Y-9rAY2FVaJZCKcou3HDX70EZudoiCigT0o,49217
 radboy/DB/__pycache__/ResetTools.cpython-311.pyc,sha256=4Vyc57iAAF0yRPjjglnVKovnTn8OoFIi6Zok3Wpj_YM,9292
@@ -388,7 +388,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=xTwMauoytB3ULqJuW9hGj0wpuu8R12C1mhLr5V8_jas,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=nRPYHK80EEuG1krhUMGWrducdfStASizFOsCcqFWD5Q,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
@@ -413,7 +413,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.411.dist-info/METADATA,sha256=dN6kxOyqkLwqE1_Dp2RSKO1gw_SEShpGTaK3Hyr2pt0,794
-radboy-0.0.411.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.411.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.411.dist-info/RECORD,,
+radboy-0.0.412.dist-info/METADATA,sha256=7Lc3EuRKlwzFZyjD_TdYXECszLyNab7-8S2kf4BqbDc,794
+radboy-0.0.412.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.412.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.412.dist-info/RECORD,,