killbill-uncached

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

4/24/2013 10:54:00 PM

invoice-rework

stephane brossier

Commit: 6620c31

Tree: dd4030e

Parents: 7e0638d
303b159

analytics: fix isRevenueRecognizable helper Make sure …

4/25/2013 9:03:01 PM

to look at items on the current invoice only.

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

Pierre-Alexandre Meyer

Commit: 1a1ddfc

Tree: e6e4626

Parents: 9fbfcef

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

4/25/2013 7:51:22 PM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 9fbfcef

Tree: c3b3634

Parents: 9f34f3d

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

4/25/2013 7:16:06 PM

invoice-rework-2

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

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

Pierre-Alexandre Meyer

Commit: 9f34f3d

Tree: f953018

Parents: 6a2064a
7e0638d

Fix tests after Implementation of Partial repair and move of …

4/24/2013 10:50:33 PM

CBA into invoice DAO

stephane brossier

Commit: 7e0638d

Tree: 4db606a

Parents: fcd61a8

Fix complication after partial repair work

4/24/2013 7:37:39 PM

stephane brossier

Commit: fcd61a8

Tree: 6ab0667

Parents: 216a53b

Implement partial repair in invoice

4/24/2013 7:25:53 PM

stephane brossier

Commit: 216a53b

Tree: bde3783

Parents: 23eaf41

Initial version for repair chnage logic

4/24/2013 2:30:07 PM

stephane brossier

Commit: 23eaf41

Tree: 9e342bb

Parents: cbe0b38

analytics: update is_recognizable in bii* tables Switch …

4/25/2013 6:51:34 PM

to item_source, since is_recognizable is too specific.

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

Pierre-Alexandre Meyer

Commit: 6a2064a

Tree: 8447704

Parents: 41f8ded

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

4/24/2013 9:07:54 PM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 41f8ded

Tree: 0db3148

Parents: 6e7441a