gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 09:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2596

Browse Source
This commit is contained in:
James Cole
2019-09-14 06:14:33 +02:00
parent dcb57cc229
commit ec43c9999a
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

8
resources/assets/js/components/transactions/EditTransaction.vue
View File

@@ -521,7 +521,6 @@
tagList.push(row.tags[tagKey].text); tagList.push(row.tags[tagKey].text);
} }
} }
// set foreign currency info: // set foreign currency info:
if (row.foreign_amount.amount !== '' && parseFloat(row.foreign_amount.amount) !== .00) { if (row.foreign_amount.amount !== '' && parseFloat(row.foreign_amount.amount) !== .00) {
foreignAmount = row.foreign_amount.amount; foreignAmount = row.foreign_amount.amount;
@@ -565,12 +564,9 @@
payment_date: row.custom_fields.payment_date, payment_date: row.custom_fields.payment_date,
invoice_date: row.custom_fields.invoice_date, invoice_date: row.custom_fields.invoice_date,
internal_reference: row.custom_fields.internal_reference, internal_reference: row.custom_fields.internal_reference,
notes: row.custom_fields.notes notes: row.custom_fields.notes,
tags: tagList
}; };
if (tagList.length > 0) {
currentArray.tags = tagList;
}
if (null !== foreignAmount) { if (null !== foreignAmount) {
currentArray.foreign_amount = foreignAmount; currentArray.foreign_amount = foreignAmount;
currentArray.foreign_currency_id = foreignCurrency; currentArray.foreign_currency_id = foreignCurrency;