killbill-memoizeit

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>

beatrix, invoice: trivial code reformatting Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

beatrix: remove debugging class TestJoda Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

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>

Rework ClockMock for bug where adding months is wrong

Invoice Partial repair logic debugging

Merge branch 'master' of github.com:killbill/killbill into …

invoice-rework

analytics: fix isRevenueRecognizable helper Make sure …

to look at items on the current invoice only.

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

invoice: fix merge issue Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

Merge remote-tracking branch 'origin/invoice-rework' into …

invoice-rework-2

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

Conflicts:
	invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGenerator.java