killbill-uncached

Merge branch 'master' of github.com:ning/killbill Conflicts: jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java

jaxrs: extend AccountTimelineJson Add refunds, chargebacks …

and credits to AccountTimelineJson.

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

invoice: fix pro-ration issue in InAdvanceBillingMode We …

had a bug where we would add an extra item of one day, in
case of a cancellation on that same day. This was caused by a
BCD calculation error in InvoiceDateUtils.

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

invoice: fix issue when converting LocalDate to DateTime Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

invoice: add more logging around pro-ration Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

invoice: fix NPE in FixedPriceInvoiceItem Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

invoice: add another test for DefaultInvoiceGenerator Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

junction: add another test for BillCycleDayCalculator Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

invoice: simplify BillingMode calculations Fix various …

alignment issues and add tests.

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

invoice: fix bug when computing the service start date The …

start date doesn't necessarily align with the BCD.

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