Merge branch 'master' of github.com:killbill/killbill into invoice-rework
Invoice Partial repair logic debugging
Rework ClockMock for bug where adding months is wrong
util: fix ClockMock implementation

The clock was stuck in the getUTCNow() call (we were always returning a
constant point in time).

This fixes entitlement tests.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
beatrix: remove debugging class TestJoda

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
beatrix, invoice: trivial code reformatting

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
invoice: fix isRepareeItemForRepairedItem logic

We can't simply rely on dates in case of complete repairs, as the new
item matches the repaired item start date. This patch makes the code
check the catalog fields as well which fixes
TestIntegrationInvoiceWithRepairLogic beatrix tests

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
invoice: fix bug in DefaultInvoiceGenerator

Rate being a BigDecimal, we should really use compareTo.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
beatrix: add missing expected NextEvent.INVOICE_ADJUSTMENT events

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
beatrix: fix date in TestIntegrationInvoiceWithRepairLogic

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'invoice-rework' into invoice-rework-2
beatrix: add test for multiple repairs in TestIntegrationInvoiceWithRepairLogic

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>