killbill-aplcache

Merge branch 'inv-ent-integration' of github.com:ning/killbill …

into inv-ent-integration

Conflicts:
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java

Added test to check that subscriptionId correctly set. Also …

fixed a bad import

updates to beatrix tests (still failing on NPE)

Merge branch 'master' of github.com:ning/killbill into inv-ent-integration Conflicts: account/src/main/java/com/ning/billing/account/api/DefaultAccount.java account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java api/src/main/java/com/ning/billing/ErrorCode.java api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java util/src/main/java/com/ning/billing/util/glue/BusModule.java util/src/main/resources/com/ning/billing/util/ddl.sql

Completing the merge from master

Fixing null return value for account balance

Updated invoice to implement account balance using Jeff's …

code

Added account balance calculation to invoice and next billing …

date calculation to entitlement - unit tests still needed for both

Adding delete to account

Merged with master