From 760f674132df3664b11f68688b8d729e4dd86310 Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Tue, 15 Mar 2016 17:04:19 +0200
Subject: [PATCH] Add ID to increment balance information

---
 engine/account.go   | 1 +
 engine/balances.go  | 6 ++++++
 engine/timespans.go | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/engine/account.go b/engine/account.go
index 136ffd296..e231875a2 100644
--- a/engine/account.go
+++ b/engine/account.go
@@ -488,6 +488,7 @@ func (ub *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun boo
 				defaultBalance.SubstractValue(cost)
 				increment.BalanceInfo.Monetary = &MonetaryInfo{
 					UUID:  defaultBalance.Uuid,
+					ID:    defaultBalance.ID,
 					Value: defaultBalance.Value,
 				}
 				increment.BalanceInfo.AccountID = ub.ID
diff --git a/engine/balances.go b/engine/balances.go
index e51b7794f..e44fa6033 100644
--- a/engine/balances.go
+++ b/engine/balances.go
@@ -357,6 +357,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala
 				b.SubstractValue(amount)
 				inc.BalanceInfo.Unit = &UnitInfo{
 					UUID:          b.Uuid,
+					ID:            b.ID,
 					Value:         b.Value,
 					DestinationID: cc.Destination,
 					Consumed:      amount,
@@ -434,6 +435,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala
 					cost, inc.Cost = 0.0, 0.0
 					inc.BalanceInfo.Monetary = &MonetaryInfo{
 						UUID:         b.Uuid,
+						ID:           b.ID,
 						Value:        b.Value,
 						RateInterval: ts.RateInterval,
 					}
@@ -456,6 +458,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala
 					b.SubstractValue(amount)
 					inc.BalanceInfo.Unit = &UnitInfo{
 						UUID:          b.Uuid,
+						ID:            b.ID,
 						Value:         b.Value,
 						DestinationID: cc.Destination,
 						Consumed:      amount,
@@ -466,6 +469,7 @@ func (b *Balance) debitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala
 					if cost != 0 {
 						inc.BalanceInfo.Monetary = &MonetaryInfo{
 							UUID:  moneyBal.Uuid,
+							ID:    moneyBal.ID,
 							Value: moneyBal.Value,
 						}
 						moneyBal.SubstractValue(cost)
@@ -554,6 +558,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala
 				amount, inc.Cost = 0.0, 0.0
 				inc.BalanceInfo.Monetary = &MonetaryInfo{
 					UUID:  b.Uuid,
+					ID:    b.ID,
 					Value: b.Value,
 				}
 				inc.BalanceInfo.AccountID = ub.ID
@@ -575,6 +580,7 @@ func (b *Balance) debitMoney(cd *CallDescriptor, ub *Account, moneyBalances Bala
 				cd.MaxCostSoFar += amount
 				inc.BalanceInfo.Monetary = &MonetaryInfo{
 					UUID:  b.Uuid,
+					ID:    b.ID,
 					Value: b.Value,
 				}
 				inc.BalanceInfo.AccountID = ub.ID
diff --git a/engine/timespans.go b/engine/timespans.go
index 57668a636..8a716f307 100644
--- a/engine/timespans.go
+++ b/engine/timespans.go
@@ -78,6 +78,7 @@ func (di *DebitInfo) Clone() *DebitInfo {
 
 type MonetaryInfo struct {
 	UUID         string
+	ID           string
 	Value        float64
 	RateInterval *RateInterval
 }
@@ -100,6 +101,7 @@ func (mi *MonetaryInfo) Equal(other *MonetaryInfo) bool {
 
 type UnitInfo struct {
 	UUID          string
+	ID            string
 	Value         float64
 	DestinationID string
 	Consumed      float64