Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-17 11:08:43 +03:00
parent 8a8f384927
commit 84466e87ba
2 changed files with 14 additions and 14 deletions

View File

@@ -206,11 +206,14 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
}
pdf.SetY(y + h)
}
setDataTextStyle := func(size float64, r, g, b int) {
pdf.SetFont("dejavu", "", size)
pdf.SetTextColor(r, g, b)
}
header()
drawHeaderRow(masterCols, masterW, 6.2, 149, 113, 22, 7.2)
pdf.SetFont("dejavu", "", 7)
pdf.SetTextColor(25, 25, 25)
setDataTextStyle(7, 25, 25, 25)
for _, m := range masters {
masterLine := []string{
@@ -228,9 +231,9 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
if needPage(rowH) {
header()
drawHeaderRow(masterCols, masterW, 6.2, 149, 113, 22, 7.2)
pdf.SetFont("dejavu", "", 7)
pdf.SetTextColor(25, 25, 25)
setDataTextStyle(7, 25, 25, 25)
}
setDataTextStyle(7, 25, 25, 25)
y := pdf.GetY()
x := marginL
@@ -252,15 +255,13 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
if needPage(11.2) {
header()
drawHeaderRow(masterCols, masterW, 6.2, 149, 113, 22, 7.2)
pdf.SetFont("dejavu", "", 7)
pdf.SetTextColor(25, 25, 25)
setDataTextStyle(7, 25, 25, 25)
}
pdf.SetFont("dejavu", "B", 7)
drawHeaderRow(currencyCols, currencyW, 5.6, 76, 95, 122, 6.8)
pdf.SetFont("dejavu", "", 6.8)
pdf.SetTextColor(35, 35, 35)
setDataTextStyle(6.8, 35, 35, 35)
currencyLine := []string{
c.DocCurrencyCode,
strconv.Itoa(c.SatirSayisi),
@@ -291,8 +292,7 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
pdf.SetY(y + cRowH)
drawHeaderRow(detailCols, detailW, 5.6, 31, 59, 91, 6.8)
pdf.SetFont("dejavu", "", 6.6)
pdf.SetTextColor(30, 30, 30)
setDataTextStyle(6.6, 30, 30, 30)
for _, d := range detailsByCurrency[c.GroupKey] {
line := []string{
@@ -317,8 +317,7 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
drawHeaderRow(masterCols, masterW, 6.2, 149, 113, 22, 7.2)
pdf.SetFont("dejavu", "B", 7)
drawHeaderRow(currencyCols, currencyW, 5.6, 76, 95, 122, 6.8)
pdf.SetFont("dejavu", "", 6.8)
pdf.SetTextColor(35, 35, 35)
setDataTextStyle(6.8, 35, 35, 35)
y = pdf.GetY()
x = marginL
for i, v := range currencyLine {
@@ -335,8 +334,7 @@ func drawStatementAgingScreenPDF(pdf *gofpdf.Fpdf, selectedDate, accountCode str
}
pdf.SetY(y + cRowH)
drawHeaderRow(detailCols, detailW, 5.6, 31, 59, 91, 6.8)
pdf.SetFont("dejavu", "", 6.6)
pdf.SetTextColor(30, 30, 30)
setDataTextStyle(6.6, 30, 30, 30)
}
rowY := pdf.GetY()