From 5b2bafffa385a4b3d40fb244ce1fd40491b411cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Wed, 11 Mar 2026 13:23:46 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[finance]=20=EC=A0=84=ED=91=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=ED=9B=84=20=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=97=90=20=EC=88=98=EC=A0=95=EB=90=9C=20=EC=A0=81=EC=9A=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=98=EC=98=81=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 은행/카드거래 행에서 원본 거래 적요 대신 전표 적요를 우선 표시 - 분개가 존재하면 journal_entries.description을 사용 --- resources/views/finance/journal-entries.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/finance/journal-entries.blade.php b/resources/views/finance/journal-entries.blade.php index 0caa2a4e..51669c65 100644 --- a/resources/views/finance/journal-entries.blade.php +++ b/resources/views/finance/journal-entries.blade.php @@ -1044,7 +1044,7 @@ className="px-2.5 py-1 text-xs font-medium bg-amber-100 text-amber-700 rounded-f key: `bank-${tx.uniqueKey}`, date: tx.transDate, time: tx.transTime, - description: tx.summary || '-', + description: (je && je.description) || tx.summary || '-', deposit: parseFloat(tx.deposit) || 0, withdraw: parseFloat(tx.withdraw) || 0, balance: tx.balance, @@ -1069,7 +1069,7 @@ className="px-2.5 py-1 text-xs font-medium bg-amber-100 text-amber-700 rounded-f key: `card-${ctx.uniqueKey}`, date: ctx.useDate, time: ctx.useTime, - description: ctx.merchantName || '-', + description: (je && je.description) || ctx.merchantName || '-', deposit: 0, withdraw: (ctx.supplyAmount || 0) + (ctx.taxAmount || 0), balance: null,