Compare commits

...

4 Commits

Author SHA1 Message Date
Trowbridge
79e3c24a37 utf-8 was causing strange characters in CMS, should make a param 2020-01-13 17:26:32 -05:00
Trowbridge
35f5b04a1d use unit of measure to translate volume breaks, change default upload function to add 2020-01-13 17:25:22 -05:00
Trowbridge
56bb03ce7d default action is 1 2020-01-13 17:24:24 -05:00
Trowbridge
aa88dbc9e7 upper bound was wrong 2020-01-13 17:23:39 -05:00
2 changed files with 3579 additions and 3578 deletions

10
FL.bas
View File

@ -948,7 +948,7 @@ Sub build_price_upload()
Dim fd As FileDialog Dim fd As FileDialog
pl = x.SHTp_GetString(Selection) pl = x.SHTp_GetString(Selection)
ReDim ul(10, UBound(pl, 2)) ReDim ul(11, UBound(pl, 2))
PRICELIST_SHOW: PRICELIST_SHOW:
@ -958,7 +958,7 @@ PRICELIST_SHOW:
pl_d1 = pricelist.tbD1.Text pl_d1 = pricelist.tbD1.Text
pl_d2 = pricelist.tbD2.Text pl_d2 = pricelist.tbD2.Text
pl_d3 = pricelist.tbD3.Text pl_d3 = pricelist.tbD3.Text
pl_action = "2" pl_action = "1"
If Len(pricelist.tbCODE) > 5 Then If Len(pricelist.tbCODE) > 5 Then
MsgBox ("price code must be 5 or less characters") MsgBox ("price code must be 5 or less characters")
@ -980,9 +980,9 @@ PRICELIST_SHOW:
ul(1, j) = pl_code ul(1, j) = pl_code
ul(2, j) = pl(7, i) ul(2, j) = pl(7, i)
ul(3, j) = pl(5, i) ul(3, j) = pl(5, i)
ul(4, j) = pl(4, i) ul(4, j) = Format(CDbl(pl(4, i)) * CDbl(pl(8, i)) / CDbl(pl(9, i)), "0.00")
ul(5, j) = pl(6, i) ul(5, j) = Format(pl(6, i), "0.00")
ul(10, j) = "2" ul(11, j) = "1"
j = j + 1 j = j + 1
Next i Next i

View File

@ -1668,7 +1668,8 @@ Function FILEp_CreateCSV(ByRef path As String, ByRef recs() As String) As Boolea
tsf.Type = 2 tsf.Type = 2
tsf.Charset = "utf-8" 'tsf.Charset = "utf-8"
tsf.Charset = "Windows-1252"
tsf.Open tsf.Open
'Set ts = f.OpenTextFile(path, ForReading, False, TristateUseDefault) 'Set ts = f.OpenTextFile(path, ForReading, False, TristateUseDefault)