killbill-aplcache

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

Fix tests after Implementation of Partial repair and move of …

CBA into invoice DAO

Fix complication after partial repair work

Implement partial repair in invoice

Initial version for repair chnage logic

analytics: update is_recognizable in bii* tables Switch …

to item_source, since is_recognizable is too specific.

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

server: fix tests failures Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

analytics: remove complexity The complexity is now in invoice …

:-)

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

invoice: rework invoice amounts definitions These now behave …

the same as Analytics, as defined here: http://killbilling.org/analytics.html

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