From 08a64f4592ebebd62ad99ac67bd509dc6da58886 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Wed, 3 Apr 2019 04:45:51 -0400 Subject: [PATCH] handle adjustments with -0- basis --- fpvt.frm | 11 +++++++++-- fpvt.frx | Bin 19992 -> 19992 bytes months.cls | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fpvt.frm b/fpvt.frm index 4e56959..0ff699d 100644 --- a/fpvt.frm +++ b/fpvt.frm @@ -624,12 +624,18 @@ Sub calc_val() '---------if volume adjustment method is selected, scale the volume up---------------------------------- If opPlugVol Then - If (pVal + bVal) = 0 Then + If (Round(pVal, 2) + Round(bVal, 2)) = 0 Then pchange = 0 + If co_num(pVal, bVal) = 0 Then + MsgBox ("a new part was added, and then adjusted to -0-") + Else + fVol = fVal / (co_num(bVal, pVal) / co_num(bVol, pVol)) + End If Else pchange = fVal / (pVal + bVal) + fVol = (pVol + bVol) * pchange End If - fVol = (pVol + bVol) * pchange + Else fVol = pVol + bVol End If @@ -660,6 +666,7 @@ Sub calc_val() If opPlugVol Then adjust("type") = "scale_v" adjust("amount") = aVal + adjust("qty") = aVol Else adjust("type") = "scale_p" adjust("amount") = aVal diff --git a/fpvt.frx b/fpvt.frx index 2336bd42e0901cf62a4b7d3fa49febae8d18c89c..d7f46560ab44b626fa05dae571282692b5f26aa3 100644 GIT binary patch delta 1571 zcmb7ET})eL82)|^xD_ajbuB-moVJ6twd)Rr7Fr4|B0ovNl^Ni|8;-ROLTMWmBTihW zPNj)D^6p}oT@dfLEIXR)Vi)sn@h@svmg$U|?83!e7_Y{K#`pUQgLK~5nL&m*nTx}Dwptk` z3;AXaG5$2=FwZZq6;z`^nN;fIoWntCNtY(1-C{_SMyt)|3#k=*HV5AO!jifDB8cEGznwsIZEIM^%49NtcAOd4yG?a zwX=ol;C0?-Jsj#>A+e0QdZ`K>${|>H1u*bymz|~3#zWV0ig+D$d)X3!SzKB;TyP)d z*aRcm30xg<%zIXj`=J`gSS(mDH!t)vnm^0@VB!dhZ}wm z{|Ynx?)T!mgU635dL|!`38#;L%6&Myf7+U?_hN)K$YHO<#!lrjOABdC;?oA?k$lhz zC$;9%Ub9=p-6$PL{|d>)xm3CbFGO`L2>Or*K8e_2rlZD$*{Af(QW_PsCR)Xni6@T0 zjgAo0Gf24&8Ur~x2&;hvUY^^537lKlh#rEzP8*HDM7IUzaL0|aogY#WQWv(f*&O6G zJ9gq@EhaBvFw5@6Fk2%uhEkYqCFDdWHbOqk`Ax`6m*7$8UEHs9U+1VxM2on(;9FMh zv5Z~S0WMU-=RIxk8@PX*y* zf0nsbxY_?UJ3EOSWz{vM1J+|g_TMofTa8cS|LgH-LHhgn{cXqkxL)cTh8hje*cn{W z)IBcl%Ev-GrfcC98Gbc9RbOS>Yq-!3Gehlyme4JHmLucZ)x93^RpDGn;b}pC_0Q0(s#(|xl)Bs(x97cCZs^++pD znA!AVTKa(1K~31%d;}*<@{x7bb`{@n`3mpCn$ib%6FK-GPy>@=2eGarZh@7tIlhqg e!-Fxem@(0Q&$ta44vY(H7RKM?!sdtLzJCFPC#}Q) delta 1455 zcmbVMT})eL82-L<$~Fos0m@(bJGA_i4!X9KmUg8rjsY7jbXk-eZwfRk;lRNvMw|pp zWQHaZLiaRWg4Mzp6B?ME1|wsu6G~=Qy0nm-N{!_p3sym9cw1O+ zXKauDU~4?bn8faKN}|6-f^5vdI18}3g|vcZ@f2qm6|bwchGz}cgY1gLXr8e$djB|h zuyVpv5oNP9)p8WR^*`b0(IP9whqcchg>MymEF~sWz%cQ%3v?lh!m0+477jAMSD2$2w%J z$e8lsA*5z2HpCKY&VSQ!@gnS0TkuKsed}QEIBh{(nSUuQFXgDgtBKV7^vwKa>1;YV ze>wFcQ$MZQ6$;nSS_;>PvAz&ev-Q96e~D@QTg-tzV^bldW}80eTtQ4)<7s>&JrVpe zZnuPmxPnq^Be}z2eSnQl6B=v|8jm4n^Wz0WHMVRXn!RmnB4??OY-0v3Gh}xNgE^#W zSY+6=cW9QwioXuu+QDVacKY$q+A6qY>~;pZk1AEEwT>PGPa@_VqEgs&wrj&pXQw!q za^feagXmSB?l8z~!K0U&IQ^l>;^TN+W6}Jc2nX?AUxPr1D=>+t;WEx)jQHtmabGG) zrj_TC@?t7UMWs=VEuy2Xxas!c*I)FSMve(KE}@V!5OI(ye`zc2k?BbyiB95$cu9+nZ3L~sW)00u@&qp zCOnaunMx&bC%8^aBz!GcISo;QZ6!^ouxdDgt%#=U_lT8BNzn=Vz7n0#diQno!GR?5h}LmQ zt$n6R(BpG<-1j;$7FeZsP}>QtUuYv``PyN3(?6xLqtd#K@o`<5=9t9Ln>>fFA}!b- zDxs)oIHN7TH2i&jOGXAXW2x6idU>IgN*`SswfYTNM2Ae@dnChcf+8d8?k*wc=va?8 z?*|PY?G`5orm^dGXbpI$$c*ns6+Vaav1U?Vh2_|c_!0T~=a_?