diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
index a6ef56d..6cf88b6 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
@@ -101,7 +101,7 @@ public interface InvoicePaymentSqlDao extends EntitySqlDao<InvoicePaymentModelDa
final UUID linkedInvoicePaymentId = getUUID(result, "linked_invoice_payment_id");
final DateTime createdDate = getDateTime(result, "created_date");
- return new InvoicePaymentModelDao(id, createdDate, type, paymentId, invoiceId, paymentDate,
+ return new InvoicePaymentModelDao(id, createdDate, type, invoiceId, paymentId, paymentDate,
amount, currency, paymentCookieId, linkedInvoicePaymentId);
}
}
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg b/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
index 3c9926d..3fe868d 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
+++ b/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
@@ -28,7 +28,7 @@ extraTableFieldsWithComma(prefix) ::= <<
>>
getInvoicesByAccount() ::= <<
- SELECT record_id as invoice_number, <allTableFields()>
+ SELECT <allTableFields()>
FROM <tableName()>
WHERE account_id = :accountId AND migrated = '0'
<AND_CHECK_TENANT()>
@@ -36,7 +36,7 @@ getInvoicesByAccount() ::= <<
>>
getAllInvoicesByAccount() ::= <<
- SELECT record_id as invoice_number, <allTableFields()>
+ SELECT <allTableFields()>
FROM <tableName()>
WHERE account_id = :accountId
<AND_CHECK_TENANT()>
@@ -44,7 +44,7 @@ getAllInvoicesByAccount() ::= <<
>>
getInvoicesByAccountAfterDate() ::= <<
- SELECT record_id as invoice_number, <allTableFields()>
+ SELECT <allTableFields()>
FROM <tableName()>
WHERE account_id = :accountId AND target_date >= :fromDate AND migrated = '0'
<AND_CHECK_TENANT()>
@@ -52,7 +52,7 @@ getInvoicesByAccountAfterDate() ::= <<
>>
getInvoicesBySubscription() ::= <<
- SELECT i.record_id as invoice_number, <allTableFields("i.")>
+ SELECT <allTableFields("i.")>
FROM <tableName()> i
JOIN invoice_items ii ON i.id = ii.invoice_id
WHERE ii.subscription_id = :subscriptionId AND i.migrated = '0'
