SamProject/sam-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: [journal] 카드거래 수정 금액이 일반전표에 미반영되는 문제 수정

Browse Source 
- 통합 목록 출금액: approvalAmount(원본) → supplyAmount+taxAmount(수정값) 사용
- 카드 분개 모달: 동일하게 수정된 금액 사용
- 외국결제 수수료 포함 금액 등 사용자 수정값이 정상 반영됨
This commit is contained in:
김보곤
2026-03-03 15:13:05 +09:00
parent 6a5976cc5d
commit 3962d4b35c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/finance/journal-entries.blade.php
View File

@@ -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, time: ctx.useTime,
description: ctx.merchantName || '-', description: ctx.merchantName || '-',
deposit: 0, deposit: 0,
withdraw: ctx.approvalAmount || 0, withdraw: (ctx.supplyAmount || 0) + (ctx.taxAmount || 0),
balance: null, balance: null,
hasJournal: ctx.hasJournal, hasJournal: ctx.hasJournal,
journalId: ctx.journalId, 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 CardJournalEntryModal = ({ transaction, accountCodes, tradingPartners, onClose, onSaved, onDeleted, onPartnerAdded }) => {
const ctx = transaction; const ctx = transaction;
const amount = ctx.approvalAmount || 0;
const supplyAmount = ctx.supplyAmount || 0; const supplyAmount = ctx.supplyAmount || 0;
const taxAmount = ctx.taxAmount || 0; const taxAmount = ctx.taxAmount || 0;
const amount = supplyAmount + taxAmount;
const isDeductible = ctx.deductionType !== 'non_deductible'; const isDeductible = ctx.deductionType !== 'non_deductible';
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);