From 3962d4b35c54f263e4d40e280d8cfec6bf168fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Tue, 3 Mar 2026 15:13:05 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[journal]=20=EC=B9=B4=EB=93=9C=EA=B1=B0?= =?UTF-8?q?=EB=9E=98=20=EC=88=98=EC=A0=95=20=EA=B8=88=EC=95=A1=EC=9D=B4=20?= =?UTF-8?q?=EC=9D=BC=EB=B0=98=EC=A0=84=ED=91=9C=EC=97=90=20=EB=AF=B8?= =?UTF-8?q?=EB=B0=98=EC=98=81=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 통합 목록 출금액: approvalAmount(원본) → supplyAmount+taxAmount(수정값) 사용 - 카드 분개 모달: 동일하게 수정된 금액 사용 - 외국결제 수수료 포함 금액 등 사용자 수정값이 정상 반영됨 --- 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 63d9cab4..bfe58249 100644 --- a/resources/views/finance/journal-entries.blade.php +++ b/resources/views/finance/journal-entries.blade.php @@ -1021,7 +1021,7 @@ className="px-2.5 py-1 text-xs font-medium bg-amber-100 text-amber-700 rounded-f time: ctx.useTime, description: ctx.merchantName || '-', deposit: 0, - withdraw: ctx.approvalAmount || 0, + withdraw: (ctx.supplyAmount || 0) + (ctx.taxAmount || 0), balance: null, hasJournal: ctx.hasJournal, journalId: ctx.journalId, @@ -1754,9 +1754,9 @@ className={`px-6 py-2 text-sm font-medium rounded-lg flex items-center gap-1 tra // ============================================================ const CardJournalEntryModal = ({ transaction, accountCodes, tradingPartners, onClose, onSaved, onDeleted, onPartnerAdded }) => { const ctx = transaction; - const amount = ctx.approvalAmount || 0; const supplyAmount = ctx.supplyAmount || 0; const taxAmount = ctx.taxAmount || 0; + const amount = supplyAmount + taxAmount; const isDeductible = ctx.deductionType !== 'non_deductible'; const [saving, setSaving] = useState(false);