diff --git a/app/src/main/java/ru/orangesoftware/financisto/export/csv/CsvExport.java b/app/src/main/java/ru/orangesoftware/financisto/export/csv/CsvExport.java index f176357a..e02a0998 100644 --- a/app/src/main/java/ru/orangesoftware/financisto/export/csv/CsvExport.java +++ b/app/src/main/java/ru/orangesoftware/financisto/export/csv/CsvExport.java @@ -104,13 +104,13 @@ private void writeLine(Csv.Writer w, Transaction t) { Category category = getCategoryById(t.categoryId); Project project = getProjectById(t.projectId); Account fromAccount = getAccount(t.fromAccountId); + Payee payee = getPayee(t.payeeId); if (t.isTransfer()) { Account toAccount = getAccount(t.toAccountId); - writeLine(w, dt, fromAccount.title, t.fromAmount, fromAccount.currency.id, 0, 0, category, null, TRANSFER_OUT, project, t.note); - writeLine(w, dt, toAccount.title, t.toAmount, toAccount.currency.id, 0, 0, category, null, TRANSFER_IN, project, t.note); + writeLine(w, dt, fromAccount.title, t.fromAmount, fromAccount.currency.id, 0, 0, category, payee, TRANSFER_OUT, project, t.note); + writeLine(w, dt, toAccount.title, t.toAmount, toAccount.currency.id, 0, 0, category, payee, TRANSFER_IN, project, t.note); } else { MyLocation location = getLocationById(t.locationId); - Payee payee = getPayee(t.payeeId); writeLine(w, dt, fromAccount.title, t.fromAmount, fromAccount.currency.id, t.originalFromAmount, t.originalCurrencyId, category, payee, location, project, t.note); if (category != null && category.isSplit() && options.exportSplits) { diff --git a/app/src/test/java/ru/orangesoftware/financisto/export/CsvExportTest.java b/app/src/test/java/ru/orangesoftware/financisto/export/CsvExportTest.java index ebcd6043..99e426e2 100644 --- a/app/src/test/java/ru/orangesoftware/financisto/export/CsvExportTest.java +++ b/app/src/test/java/ru/orangesoftware/financisto/export/CsvExportTest.java @@ -99,8 +99,8 @@ public void should_export_split_transfer() throws Exception { .create(); assertEquals( "2011-08-03,22:34:55,My Cash Account,-5.00,SGD,\"\",\"\",SPLIT,\"\",P1,Home,R1,My note\n"+ - "~,\"\",My Cash Account,-5.00,SGD,\"\",\"\",\"\",\"\",\"\",Transfer Out,,\n"+ - "~,\"\",My Bank Account,1.00,CZK,\"\",\"\",\"\",\"\",\"\",Transfer In,,\n", + "~,\"\",My Cash Account,-5.00,SGD,\"\",\"\",\"\",\"\",P1,Transfer Out,,\n"+ + "~,\"\",My Bank Account,1.00,CZK,\"\",\"\",\"\",\"\",P1,Transfer In,,\n", exportAsString(options)); }