From 3447f9d48c738f35e589341c702aead581250f55 Mon Sep 17 00:00:00 2001
From: Trowbridge <ptrowbridge@HC-Companies.com>
Date: Wed, 6 Mar 2019 04:44:08 -0500
Subject: [PATCH] initial rework of value calc

---
 fpvt.frm |  36 ++++++++++++++++++++++--------------
 fpvt.frx | Bin 24600 -> 24600 bytes
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/fpvt.frm b/fpvt.frm
index d26be83..a51e574 100644
--- a/fpvt.frm
+++ b/fpvt.frm
@@ -231,11 +231,11 @@ End Sub
 '--------------------------------monthly buttons--------------------------------------
 
 Private Sub opmPrice_Click()
-    'calc_mval
+    calc_mval
 End Sub
 
 Private Sub opmVol_Click()
-    'calc_mval
+    calc_mval
 End Sub
 
 Private Sub tbmfPrice_Change()
@@ -248,6 +248,12 @@ End Sub
 
 
 
+Private Sub tbMFVal_Change()
+    If mline = 0 Then Exit Sub
+    If clear_lb Or load_tb Then Exit Sub
+    If opEditSalesM Then calc_mval
+End Sub
+
 Private Sub tbmfVol_Change()
     If mline = 0 Then Exit Sub
     If clear_lb Or load_tb Then Exit Sub
@@ -560,31 +566,33 @@ Sub calc_mval()
     Dim pchange As Double
     
     If IsNumeric(tbMFVal.value) Then
+        fValm = tbMFVal.value
         'calculate percent change
-        If (CDbl(tbmPAVal.value) + CDbl(tbMBaseVal.value)) = 0 Then Exit Sub
-        pchange = CDbl(tbMFVal.value) / (CDbl(tbmPAVal.value) + CDbl(tbMBaseVal.value))
+        'If (pValm + bValm) = 0 Then Exit Sub
+        pchange = fValm / (pValm + bValm)
         
         'plug the adjustment required
-        tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###")
+        aValm = fValm - bValm - pValm
         
         
         '---------if volume adjustment method is selected, scale the volume up----------------------------------
         If opmvol Then
-            tbMFVol = Format((CDbl(tbMPAVol.value) + CDbl(tbMBaseVol.value)) * pchange, "#,###")
+            fVolm = (pVolm + bVolm) * pchange
         Else
-            tbMFVol = Format((CDbl(tbMPAVol.value) + CDbl(tbMBaseVol.value)), "#,###")
+            fVolm = pVolm + bVolm
         End If
-        tbMFPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value), "#.000")
-        tbMAVol = Format(tbMFVol - (CDbl(tbMBaseVol) + CDbl(tbMPAVol)), "#,###")
-        tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((CDbl(tbMBaseVal.value) + CDbl(tbmPAVal.value)) / (CDbl(tbMBaseVol.value) + CDbl(tbMPAVol.value))), "#.000")
+        fPrcm = fValm / fVolm
+        aVolm = fVolm - (bVolm + pVolm)
+        aPrcm = fValm / fVolm - (bValm + pValm) / (bVolm + pVolm)
     Else
-        'tbMFVal = Format(CDbl(tbMPAVal.value) + CDbl(tbMBaseVal.value), "#,###")
-        tbMAVol = Format((CDbl(tbMFVol.value) - CDbl(tbMBaseVol.value) - CDbl(tbMPAVol.value)), "#,###")
-        tbMAPrice = 0
-        'tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((tbMBaseVal + tbMPAVal) / (tbMBaseVol + tbMPAVol)), "#.000")
+        aVolm = fVolm - bVolm - pVolm
+        aPrcm = 0
     End If
     tbMFVal = Format(tbMFVal, "#,###")
     
+    Me.load_mbox
+    Me.load_array
+    
 End Sub
 
 Sub calc_mprice()
diff --git a/fpvt.frx b/fpvt.frx
index a9afb121ce66dbfca26929357dfbbd4fcc6175bf..2d3090bb25b469ab99c659ac22cb5866eb943cbc 100644
GIT binary patch
delta 1187
zcmZWoT}+!*7(VBGMQx?c$~sHOzz>=h2n#SQrIhlm`?>)a>(AOk3u&EQQ-iTxvC0J|
zi!(~h8kZ$JG1)G5v5U<Zw@LC{xFu@ljWIFnG!P@Z*|k@qiHZ0Z-|qv=0ypP9dGb8(
zdETFM^#Q;7fUgb<i7|$NxW!9&A`T12w7<k9^E2TeG&^6{>diH7TV<<sU*|iR#a5I4
z$K>~P9_sd*ZTq^;cOXm4UP!CAd~4!aq@4HYwdU5%eG=DR3F`YG&2soRzE62%zj7a>
zS=vdtTg`Ta<;B`wsQwhRU5sXtKM;Cv(B<S5aog?XKCHRBIrYo^nMs`U<95#+VbAuy
z&lx`K?cim6+S|>Cutq1bdNU?b>PNc&M^Pvfc@VjQSMl$p6B`3VL}(tIFzKn&z9g^W
zV_zR%#G0?$#Mr_Rj)z=u4u6hVG6dBh#7X}t6f&>idVUbDkt+U9S@F@xA&C_k3S$m@
zJ#s=~Ri-rsE^`t&$jl?fi-)75Q2aLhG}@1b>L9yUf^OXPAH?OLM-)pqX7XSoxU6d_
z&$PZA+WoN*hev5g%eXAci?~Q@LKP&&+p%?G7T*whzNn)Rid(7`Ds=C_gc5q8T4th^
z^-z)~#x5pmuN6yWYSj0N2VW`&#9Q;)BV~Xarg`{XDV|-?mcuvsj@jAMM{p<V!Q<&L
zzEUhm1e^FvXeiyf7}qip<RW%+;mLP1h4NyFp(8(mFCu2CN*)*TXEfJIE0?M@Dk|X6
z#!oGA+*M^Xh68BKoHbah>M@v89zKeJR1&VKBCp`WRF`-&iW^fi6tu0WkVGar_4y{$
z_U+uNqPJlo+J$5?K=wkgMP-~<!@KaG$w@p^df>{oAs4e7Uu-ku)suuHGVaB!=E8i{
z=tlvuY!Y&Oghz2;tP@M|=gGu!{0(CSJnVoqu_9<1Hxe1ztF45WRz*J3Dd39r7~{W|
zDk3yyg*ja@G)w6|qTEc|Ir=BVWa~H;&<9zKO85U*#)3L-ban1@8$};3<pNK6Z4u{6
z*vw3uX=a8$jz&zzin9%26E!{iI+<vi{asQYYxrmOj`0`fj?#l0bJvNh9^~)rj3|Jg
zb4O8$#9QBfjxjqi2X~XoUU{Zk)*$CQXa#>YDcHzgft)^s3orjd4^+;6BIenDhFp%Y

delta 1198
zcmZvcZD?Cn7{|{!_qHyv=~&m;CN^8ztZmZHH0{#7HE&IDt+KqV%iHEUn{^i^+<0rY
z3Kb?3EV|&F<c~0gsrxX8IGu3OO%UnuOQA4@iVzvh2_pDGr?3yBSUfiyen|G^T=?JT
z|D50R!a2V}&#%xg#+k7D!)x%dkLe<AGc&urrf#q^y4Jbh$%)N%wbE9m?F$z+%bV*z
z(g$Bv-(D6PG*q^g8zp^5qoh_kRz;e`fv)RRL0k9TCX1=jf=ZL5>dpT&GC|+d>}--$
zz2y<koz2cBN!455U~Js4qOXfGMaC7|03}$r4N{l7VY@2g=!hNWm>#$6L)3-G9Iw+V
z-g4~VL7zGXwNQS_>V_jPGKC=H{0YC>cQIK;dZf&XGDbxsY9nLxnA+yrD{4x{J;QyM
z-NTyOJt)d#VGNO=30>pY@Jc|BU-mkw8xc<kKlry`pC`mTGR_5T{O5LdlHmLBvxtgq
zFnJXOCk%MkYZMZNDvA@GxZ#}?l(M9@_|DQNMhRiv#7+olCFFEYkrzvnPsTfeK01mu
z{{$~+%|D5i@D`*4Ex6(7ryg8A?B)8XIDlGUS-70k@@9opp{jm85u}j97IcKH?6`u{
ze62hL>5xTJje8z(n@i*7>Anlu>W*0pTEbS`3tGU!wtBLgvF-FEJ_y<IZFnor2Kw=5
zauBA-Z$e3Of<|8xh(grm=p|YY`Z@a?zRdRXU_FO!MaAQ-o5JxC7-v)XCax2B!Rl)K
z2xWx8<uj_Gr<W)`j}2ii=cK%qv7PuT8|BI#obmYT_RXnR`Cv~?_py0`i_<wiO!fYB
zP{31DQIrys+^`F8hulaetPjmrI)<(J8Qd8k<}EbfPQn3m!Hiq^j`riqgKm4t%M0?N
z)+y>oB;JebNrR3n>GBKn62Z-+mFs_tLolVn$Vd9HlzN<VET>))q!S5VeJ2d*D&s@A
zn9g(b`{@C`ZPxw03^fiG6}$1?fqA^?H9(gs)u*+T8KzbBQf3>)i-{<lQxVSJ&)I!2
z=Xz)yN^BnQ@9TM3{v1q&CpBjNLf~#btK(bpKiv#IDjefHEeG#uO~t<lKVy=DD~ERT
zD{6->P;H;n`Dg02|8aO&S3D}^it?gV#E#jNz>CCce19FYHhYfq_hveA>d0R_W$F1(
H_;~&Uq_)$Z