commit 65b19d2a3e19305d981a95cda36c6f5fa3dbdb17
parent 8e471d0b0cd3bf5374c02d93b5645c8971cf2694
Author: Bob Haugen <bob.haugen@gmail.com>
Date: Fri, 7 Feb 2020 11:03:07 -0600
Merge pull request #608 from valueflows/transfer-name
transfer-complete > transfer
Diffstat:
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/docs/introduction/flows.md b/docs/introduction/flows.md
@@ -61,7 +61,7 @@ All flows use an action property to designate what the flow is doing and how it
* vf:deliver-service - new service produced and delivered (a service implies that an agent actively receives the service)
* vf:transfer-all-rights - give full (in the human realm) rights and responsibilities to another agent, without transferring physical custody
* vf:transfer-custody - give physical custody and control of a resource, without full accounting or ownership rights
-* vf:transfer-complete - give full rights and responsibilities plus physical custody
+* vf:transfer - give full rights and responsibilities plus physical custody
* vf:move - change location and possibly identifier, if location is part of the identification, of a resource with no change of agent rights or possession
* vf:raise - adjusts a quantity up based on a beginning balance or inventory count
* vf:lower - adjusts a quantity down based on a beginning balance or inventory count
@@ -82,7 +82,7 @@ pass | No effect | Increment| Output | No | accept |
fail | No effect | (3) | Output | (3) | accept |
transfer-custody | No effect | Decr+Incr(2) | N/A | No | N/A |
transfer-all-rights | Decr+Incr(2) | No effect | N/A | No | N/A |
-transfer-complete | Decr+Incr(2) | Decr+Incr(2) | N/A | No | N/A |
+transfer | Decr+Incr(2) | Decr+Incr(2) | N/A | No | N/A |
move | Decr+Incr(2) |Decr+Incr(2) | N/A | No | N/A |
raise | Increment | Increment | N/A | No | N/A |
lower | Decrement | Decrement | N/A | No | N/A |
diff --git a/examples/claim.yaml b/examples/claim.yaml
@@ -26,7 +26,7 @@
- '@id': mfg:d4d2fd71-34f2-41c3-b1c5-19ad5ed2da58
'@type': Claim
- action: transfer-complete
+ action: transfer
provider: https://manufacturing.example/
receiver: https://bob.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q1104069 # Canadian dollar
@@ -41,7 +41,7 @@
- '@id': mfg:c7897c39-7f05-4a5d-a487-80e130a2414a
'@type': EconomicEvent
- action: transfer-complete
+ action: transfer
provider: https://manufacturing.example/
receiver: https://bob.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q1104069 # Canadian dollar
diff --git a/examples/exch-agreement.yaml b/examples/exch-agreement.yaml
@@ -17,7 +17,7 @@
- '@id': alice:2342d456-5d6f-46d5-a7ed-3ac7bfd5a86c
'@type': Commitment
clauseOf: alice:57f1c1d0-432e-4bfa-9d32-002b8955a708
- action: transfer-complete
+ action: transfer
provider: https://alice.example/
receiver: https://bob.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q89 # apples
@@ -28,7 +28,7 @@
- '@id': bob:fd399b37-0740-4a68-a184-1e655021ca21
'@type': Commitment
clauseOf: alice:57f1c1d0-432e-4bfa-9d32-002b8955a708
- action: transfer-complete
+ action: transfer
provider: https://bob.example/
receiver: https://alice.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q5977438 # soft apple cider
diff --git a/examples/exch-retail.yaml b/examples/exch-retail.yaml
@@ -15,7 +15,7 @@
- '@id': store:a8356625-bf64-4c16-9099-28aa1b718c4b
'@type': EconomicEvent
realizationOf: store:ac9ec98d-db80-44dc-97be-7aa149b2fe5d
- action: transfer-complete
+ action: transfer
provider: https://store.example/
receiver: https://carol.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q47107 # bucket
@@ -26,7 +26,7 @@
- '@id': store:2342d456-5d6f-46d5-a7ed-3ac7bfd5a86c
'@type': EconomicEvent
realizationOf: store:ac9ec98d-db80-44dc-97be-7aa149b2fe5d
- action: transfer-complete
+ action: transfer
provider: https://carol.example/
receiver: https://store.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US dollar
diff --git a/examples/proposal-barter.yaml b/examples/proposal-barter.yaml
@@ -35,7 +35,7 @@
'@type': Intent
name: Cider
skos:note: Fresh cider from the pressing
- action: transfer-complete
+ action: transfer
provider: https://carol.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q5977438 # apple cider
resourceQuantity:
diff --git a/examples/proposal-list.yaml b/examples/proposal-list.yaml
@@ -20,7 +20,7 @@
- '@id': farm:c7897c39-7f05-4a5d-a487-80e130a24345
'@type': Intent
name: Carrots case 25#
- action: transfer-complete
+ action: transfer
provider: https://farm.example/
resourceClassifiedAs: wd:Q81 # carrot
resourceSpecifiedAs: farm:2402b57c-1c45-423a-acb2-f50961c97d65 # 25 pound case organic carrots seconds
@@ -37,7 +37,7 @@
- '@id': farm:0f563083-7f05-4a5d-a487-80e130a24345
'@type': Intent
name: Payment
- action: transfer-complete
+ action: transfer
receiver: https://farm.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US Dollar
resourceQuantity:
@@ -60,7 +60,7 @@
- '@id': farm:54b814ee-62dc-40c1-bb96-f8582aa4f771
'@type': Intent
name: Beets case 25#
- action: transfer-complete
+ action: transfer
provider: https://farm.example/
resourceClassifiedAs: wd:Q165437 # beet root
resourceSpecifiedAs: farm:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 # 25 pound case organic beets
@@ -77,7 +77,7 @@
- '@id': farm:21f361a6-2375-46bb-b192-c21b5ba833bf
'@type': Intent
name: Payment
- action: transfer-complete
+ action: transfer
receiver: https://farm.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US Dollar
resourceQuantity:
diff --git a/examples/proposal-plan.yaml b/examples/proposal-plan.yaml
@@ -47,7 +47,7 @@
'@type': Intent
name: Payment
skos:note: Payment when the unit is manufactured and sold
- action: transfer-complete
+ action: transfer
provider: https://fablab.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US Dollar
agreedIn: https://fablab.example/soil-sensor-project/value-equation/
diff --git a/examples/simple-proposals.yaml b/examples/simple-proposals.yaml
@@ -21,7 +21,7 @@
'@type': Intent
name: Old adult Schwinn one speed bike
skos:note: Pedals fine, not good for hills, has basket, brakes are a bit dodgy
- action: transfer-complete
+ action: transfer
provider: https://alice.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q11442 # bicycle
@@ -34,7 +34,7 @@
- '@id': alice:e72f7d1d-4f0a-4518-a44c-96658cafda95
'@type': Intent
name: Payment
- action: transfer-complete
+ action: transfer
receiver: https://alice.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US Dollar
resourceQuantity:
diff --git a/examples/transfer-crypto.yaml b/examples/transfer-crypto.yaml
@@ -31,7 +31,7 @@
- '@id': urn:uuid:e5afaa28-1080-4912-835b-46883efb83e6
'@type': EconomicEvent
- action: transfer-complete
+ action: transfer
resourceClassifiedAs: wd:Q21002847 # FairCoin
resourceInventoriedAs: fair:b75d8f6a-e2df-4e52-b36d-1a22a66f4ead # Alice's wallet address
toResourceInventoriedAs: fair:3be5259d-10f0-431c-9fec-9c0c15a461d3 # Bob's wallet address
diff --git a/examples/transport-with-transfer.yaml b/examples/transport-with-transfer.yaml
@@ -27,7 +27,7 @@
- '@id': urn:uuid:6b5bc786-b9ed-4189-b34f-5ef7d10f1f86
'@type': Commitment
- action: transfer-complete
+ action: transfer
resourceClassifiedAs: wd:Q41777871 # haralson apples
provider: https://alice.example/
receiver: https://bob.example/
@@ -43,7 +43,7 @@
- '@id': urn:uuid:33e8933b-ff73-4a01-964a-ca7a98893083
'@type': Commitment
- action: transfer-complete
+ action: transfer
resourceClassifedAs: wd:Q4917 # US Dollar
provider: https://alice.example/
receiver: https://claudia.example/
@@ -248,7 +248,7 @@
- '@id': urn:uuid:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9
'@type': EconomicEvent
- action: transfer-complete
+ action: transfer
resourceClassifedAs: wd:Q4917 # US Dollar
resourceInventoriedAs: alice:daa2ec3b-2c1a-4eb1-839f-8dcec1a1f93a # alice's bank account
toResourceInventoriedAs: claudia:bd5806d6-4a36-45b9-b3b6-3e7d361a5a14 # claudia's bank account
diff --git a/release-doc-in-process/all_vf.TTL b/release-doc-in-process/all_vf.TTL
@@ -959,13 +959,13 @@ vf:transfer-all-rights a owl:NamedIndividual ,
rdfs:label "transfer-all-rights" ;
vs:term_status "unstable" .
-vf:transfer-complete a owl:NamedIndividual ,
+vf:transfer a owl:NamedIndividual ,
vf:Action ;
vf:inputOutput vf:notApplicable ;
vf:pairsWith vf:notApplicable ;
vf:resourceEffect vf:decrementIncrement ;
rdfs:comment "Give full rights and responsibilities plus physical custody." ;
- rdfs:label "transfer-complete" ;
+ rdfs:label "transfer" ;
vs:term_status "unstable" .
vf:transfer-custody a owl:NamedIndividual ,
