Commit 63de35d5 authored by James Bracegirdle's avatar James Bracegirdle

resolving update merge conflicts for workspace from studio [potentially affected 10 entities]

parent 2f71a9ec
Pipeline #160 passed with stage
This diff is collapsed.
This diff is collapsed.
......@@ -123,6 +123,13 @@
"value" : "Specifies the price as a cashflow amount embedded as part of a a contractual product."
} ],
"type" : "cdm::model::Money"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "unit",
"type" : "String"
} ],
"taggedValues" : [ {
"tag" : {
......
......@@ -34,7 +34,7 @@
} ],
"property" : "payout"
} ],
"property" : "equityPayout"
"property" : "assetPayout"
} ]
} ],
"parameters" : [ ]
......
......@@ -311,6 +311,26 @@
"value" : "The definition of the business day convention and financial business centers used for adjusting the payment date if it would otherwise fall on a day that is not a business day in the specified business center."
} ],
"type" : "cdm::model::BusinessDayAdjustments"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "dayType",
"type" : "cdm::model::DayTypeEnum"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "daydistribution",
"type" : "String"
}, {
"multiplicity" : {
"lowerBound" : 0
},
"name" : "businessCenters",
"type" : "cdm::model::BusinessCenters"
} ],
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
......
......@@ -683,7 +683,7 @@
"multiplicity" : {
"lowerBound" : 0
},
"name" : "equityPayout",
"name" : "assetPayout",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
......@@ -418,6 +418,13 @@
},
"name" : "security",
"type" : "cdm::model::Security"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "commodity",
"type" : "cdm::model::Commodity"
} ],
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
......
......@@ -63,7 +63,7 @@
"package" : "cdm::model",
"properties" : [ {
"multiplicity" : {
"lowerBound" : 1,
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "quantity",
......@@ -89,6 +89,34 @@
"value" : "identifier for the asset being quantified, allowing it to be positioned in the product definition."
} ],
"type" : "cdm::model::AssetIdentifier"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "unit",
"type" : "String"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "multiplier",
"type" : "Number"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "multiplierType",
"type" : "String"
}, {
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"name" : "totalQuantity",
"type" : "Number"
} ],
"taggedValues" : [ {
"tag" : {
......
......@@ -254,6 +254,13 @@
"value" : "The qualification as to how the transfer will settle, e.g. a DvP settlement."
} ],
"type" : "cdm::model::TransferSettlementEnum"
}, {
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"name" : "deliveryRollDate",
"type" : "cdm::model::RollConventionEnum"
} ],
"superTypes" : [ "cdm::model::SettlementBase" ],
"taggedValues" : [ {
......
......@@ -386,6 +386,10 @@
} ],
"type" : "cdm::model::TriggerTimeTypeEnum"
} ],
"stereotypes" : [ {
"profile" : "meta::pure::profiles::typemodifiers",
"value" : "abstract"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment