killbill-uncached

Merge remote-tracking branch 'origin/master' into invoice_and_usage

9/3/2015 2:59:09 PM

stephane brossier

Commit: 9cb89f0

Tree: 750d506

Parents: 01a165d
88f19a5

Changes

catalog/src/test/resources/SpyCarAdvanced.xml 4(+4 -0)

profiles/killbill/src/main/resources/SpyCarAdvanced.xml 4(+4 -0)

Details

catalog/src/test/resources/SpyCarAdvanced.xml 4(+4 -0)

diff --git a/catalog/src/test/resources/SpyCarAdvanced.xml b/catalog/src/test/resources/SpyCarAdvanced.xml
index be7c2c6..da2b95b 100644
--- a/catalog/src/test/resources/SpyCarAdvanced.xml
+++ b/catalog/src/test/resources/SpyCarAdvanced.xml
@@ -612,6 +612,10 @@
                             <value>5.95</value>
                         </price>
                         <price>
+                            <currency>EUR</currency>
+                            <value>6.95</value>
+                        </price>
+                        <price>
                             <currency>USD</currency>
                             <value>7.95</value>
                         </price>

profiles/killbill/src/main/resources/SpyCarAdvanced.xml 4(+4 -0)

diff --git a/profiles/killbill/src/main/resources/SpyCarAdvanced.xml b/profiles/killbill/src/main/resources/SpyCarAdvanced.xml
index be7c2c6..da2b95b 100644
--- a/profiles/killbill/src/main/resources/SpyCarAdvanced.xml
+++ b/profiles/killbill/src/main/resources/SpyCarAdvanced.xml
@@ -612,6 +612,10 @@
                             <value>5.95</value>
                         </price>
                         <price>
+                            <currency>EUR</currency>
+                            <value>6.95</value>
+                        </price>
+                        <price>
                             <currency>USD</currency>
                             <value>7.95</value>
                         </price>