Merge pull request #57 from OpenPEPPOL/2021-Spring-ReleaseCandidate

2021 spring release candidate
OpenPEPPOL · Apr 30, 2021 · 1bc6ca7 · 1bc6ca7
2 parents e006b3e + 42e5118
commit 1bc6ca7
Show file tree

Hide file tree

Showing 31 changed files with 672 additions and 992 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 
 # PEPPOL BIS Upgrade
 
-This repository is used for the PEPPOL BIS Upgrade project...
+This repository is used for the PEPPOL BIS Upgrade project
diff --git a/guides/profiles/1-catalogueonly/main.adoc b/guides/profiles/1-catalogueonly/main.adoc
@@ -2,7 +2,7 @@ include::../../shared/links.adoc[]
 
 = image:../../shared/images/peppol.png[float="right"]PEPPOL BIS Catalogue With Response 3.1
 {author}
-v{version}
+
 :doctype: book
 :icons: font
 :stem:

diff --git a/guides/profiles/18-punchout/main.adoc b/guides/profiles/18-punchout/main.adoc
@@ -10,9 +10,8 @@ include::../../shared/links.adoc[]
 :sectnums:
 :title-logo-image: ../../shared/images/peppol.png
 :snippet-dir: ../../../../rules/snippets/punchout
-= image:../../shared/images/peppol.png[float="right"]BIS Punch Out 3.0
+= image:../../shared/images/peppol.png[float="right"]BIS Punch Out 3.1
 {author}
-v{version}
 
 {description}
 

diff --git a/guides/profiles/28-ordering/main.adoc b/guides/profiles/28-ordering/main.adoc
@@ -14,9 +14,8 @@ include::../../shared/links.adoc[]
 :snippet-dir: ../../../../rules/snippets/order
 :snippet-response-dir: ../../../../rules/snippets/order-response
 
-= image:../../shared/images/peppol.png[float="right"]BIS Ordering 3.1
+= image:../../shared/images/peppol.png[float="right"]BIS Ordering 3.2
 {author}
-v{ord_version}
 
 
 {description}

diff --git a/guides/profiles/3-order-only/main.adoc b/guides/profiles/3-order-only/main.adoc
@@ -11,9 +11,8 @@ include::../../shared/links.adoc[]
 :transaction-path: ../../transactions/01-order
 :snippet-dir: ../../../../rules/snippets/order
 
-= image:../../shared/images/peppol.png[float="right"]BIS Order only 3.1
+= image:../../shared/images/peppol.png[float="right"]BIS Order only 3.2
 {author}
-v{ord_version}
 
 {description}
 

diff --git a/guides/profiles/30-despatchadvice/main.adoc b/guides/profiles/30-despatchadvice/main.adoc
@@ -12,7 +12,6 @@ include::../../shared/links.adoc[]
 :snippet-dir: ../../../../rules/snippets/despatch
 = image:../../shared/images/peppol.png[float="right"]PEPPOL BIS Despatch Advice 3.1
 {author}
-v{version}
 
 {description}
 

diff --git a/guides/profiles/36-mlr/main.adoc b/guides/profiles/36-mlr/main.adoc
@@ -12,7 +12,6 @@ include::../../shared/links.adoc[]
 :snippet-dir: ../../../../rules/snippets/mlr
 = image:../../shared/images/peppol.png[float="right"]BIS Message Level Response 3.0
 {author}
-v{version}
 
 {description}
 

diff --git a/guides/profiles/42-orderagreement/main.adoc b/guides/profiles/42-orderagreement/main.adoc
@@ -10,9 +10,9 @@ include::../../shared/links.adoc[]
 :sectnums:
 :title-logo-image: ../../shared/images/peppol.png
 :snippet-dir: ../../../../rules/snippets/order-agreement
+
 = image:../../shared/images/peppol.png[float="right"]BIS Order Agreement 3.0
 {author}
-v{version}
 
 {description}
 

diff --git a/guides/profiles/42-orderagreement/process/index.adoc b/guides/profiles/42-orderagreement/process/index.adoc
@@ -17,12 +17,6 @@ The order agreement process flow can be described as follows:
 
 An Order Agreement may refer to a framework agreement for its terms and conditions; otherwise the Buyer’s terms and conditions apply.
 
-== Business process Diagram
-
-=== Legend for BPMN diagrams
-
-The diagrams are expressed in the BPMN notation. The diagram below serves as an explanation for the diagrams used in the process descriptions.
-
 :leveloffset: +1
 
 include::../../../shared/bpmn/bpmn-legend.adoc[]

diff --git a/guides/profiles/63-invoiceresponse/main.adoc b/guides/profiles/63-invoiceresponse/main.adoc
@@ -11,9 +11,8 @@ include::../../shared/links.adoc[]
 :title-logo-image: ../../shared/images/peppol.png
 :snippet-dir: ../../../../rules/snippets/imr
 
-= image:../../shared/images/peppol.png[float="right"]BIS Invoice Response 3.0
+= image:../../shared/images/peppol.png[float="right"]BIS Invoice Response 3.1
 {author}
-v{version}
 
 {description}
 

diff --git a/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc b/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc
@@ -59,8 +59,9 @@ The Seller may still respond externally if he has comments or objections to the
 Buyer is rejecting this invoice but not necessarily the commercial transaction.
 Although it can be used also for rejection for commercial reasons (invoice not corresponding to delivery). |YES |YES |YES |YES
 |AP |Accepted |Indication that the referenced offer or transaction (e.g., cargo booking or quotation request) has been accepted. |Status is used only when the Buyer has given a final approval of the invoice and the next step is payment |NO |NO |YES |YES
-|PD |Fully Paid |Indicates that the referenced document or transaction has been paid. |Status is used only when the Buyer has initiated the payment of the invoice. |NO |NO |NO |YES
 |PD with PPD (1) |Partially Paid |Indicates that the referenced document or transaction has been partially paid. |Status is used together with Clarification Reason code PPD, only when the Buyer has initiated the payment of the invoice without having paid the accepted amount in full. |NO |NO |NO |NO
+|PD |Fully Paid |Indicates that the referenced document or transaction has been paid. |Status is used only when the Buyer has initiated the payment of the invoice. |NO |NO |NO |NO
+
 |====
 
 (1) Status code PD (Paid) together with Clarification Reason code PPD (Partially Paid) is the case when an invoice is partially paid with the intention of later paying the full invoice amount as was accepted.

diff --git a/guides/profiles/64-catalogue-wo-response/main.adoc b/guides/profiles/64-catalogue-wo-response/main.adoc
@@ -2,7 +2,6 @@ include::../../shared/links.adoc[]
 
 = image:../../shared/images/peppol.png[float="right"]PEPPOL BIS Catalogue without response 3.1
 {author}
-v{version}
 :doctype: book
 :icons: font
 :stem:

diff --git a/guides/release-notes/main.adoc b/guides/release-notes/main.adoc
@@ -1,4 +1,4 @@
-= Release notes for PEPPOL BIS 3.0 documents, other than PEPPOL BIS Billing 3.0
+= Release notes for PEPPOL BIS 3 documents, other than PEPPOL BIS Billing 3.0
 openPEPPOL AISBL <http://www.peppol.eu/>
 :icons: font
 :source-highlighter: coderay
@@ -14,6 +14,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation
 
 :leveloffset: +1
 
+include::v3.0.7.adoc[]
+
 include::v3.0.6-hotfix.adoc[]
 
 include::v3.0.5.adoc[]

diff --git a/guides/release-notes/v3.0.6-hotfix.adoc b/guides/release-notes/v3.0.6-hotfix.adoc
@@ -1,6 +1,6 @@
 = Version 3.0.6 - hotfix
 [horizontal]
-Release date:: 2019-11-09
+Release date:: 2020-11-09
 
 == Changes to syntax
 * Corrected cardinality of cac:DespatchLine/cac:OrderLineReference/cac:OrderLine to 0..1 instead of 1..1 in Despatch Advice in line with BIS specification.[POACC-347]

diff --git a/guides/release-notes/v3.0.7.adoc b/guides/release-notes/v3.0.7.adoc
@@ -0,0 +1,52 @@
+= Version 3.0.7
+[horizontal]
+Release date:: 2021-05-03
+
+== Changes to BIS document
+* The version numbers used in the BIS-documentation were inconsistant with the actual version numbers listed on the main documentation page. Version numbers should now be aligned. [POACC-391]
+
+* Changes in the documentation of Despatch Advice transaction 3.1. rule T16-R009 and T16-R010 is now reffering to seller party and originator customer party instead of buyer party [POACC-377].
+
+* Peppol logo updated to new design [POACC-375]
+
+* In Order Agreement BIS. Duplicated headings and intro text 3.3 and 3.3.1 removed. Later sections renumbered accordingly. [POACC-393]
+
+* Description of calculation of totals in Order Only BIS corrected so that class is shown as cac:AnticipatedMonetaryTotal instead of cac:LegalMonetaryTotal. No affect on functionality. [POACC-397]
+
+* Update of links to Use Case examples [POACC-383]
+
+* Catalogue BIS, both with and without response, the desciption for quantities and units in section 6.8 edited by adding tir numbers to the examples and to the business terms and the description of the business terms aligned with their desciption in the catalogue transaction data model. [POACC-374]
+
+== Changes to syntax
+* Order Transaction - an element which is mandatory in UBL was missing in the syntax description. The element (cac:Shipment/cbc:ID) is now added and with a fixed value "NA". The change was considered a bug-fix as the previous documentation would result in invalid UBL instances. [POACC-389 and POACC-380]
+
+* Order Transaction - the XML Elements for DeliveryParty Contact was incorrectly located under the DeliveryParty. The Contact element has been located correctly according to the UBL-schema.  The change was considered a bug-fix as the previous documentation would result in invalid UBL instances. [POACC-379]
+
+* An editorial change has been made in the description of the element Order/CustomerReference in the Order Transaction. Previous wording "Your reference" is changed to "Buyer reference" aligning the description with the business term used in the Invoice. [POACC-364]
+
+* Despatch Advice transcation, business term DespatchAddress/ID given description and tir id [POACC-368]
+
+* Missing tir id for cac:TaxScheme/cbc:ID added to OrderAgreement, PunchOut and Catalogue [POACC-373)
+
+* Order Agreement, added to description for Previous order Identifier that it is an optional business term but is a required element in the UBL syntax so if no previous order identifier is available use NA. [POACC-361]
+
+* Clarification on the syntax documentation of Buyer reference identifier (ReceiverParty/Contact/ID) in Punch Out transaction 3.1 [POACC-363].
+
+== Changes to code lists and validation artefacts
+
+* Edits to status code for Invoice Response to clarify additions made in last release [POACC-370]
+
+* Incorrect special characters removed from IT and SE country rules [POACC-398]
+
+* ICD code list details edited to remove contact information [POACC-388]
+
+* Code lists updated to align with EN 16931 and BIS Billing [POACC-407]
+
+** ICD code list. Added 0210, 0211, 0212, 0213
+
+** EAS code list. Added 0210, 0211, 0212, 0213. Removed 9956
+
+** UOM code list. Added 49 new codes into Recommendation 20 and 21
+
+== Changes to previous release notes
+* The date for the hotfix published in november 2020 was incorrectly dated to 2019. This date is corrected in this release.
diff --git a/guides/shared/images/peppol.png b/guides/shared/images/peppol.png
diff --git a/guides/shared/links.adoc b/guides/shared/links.adoc
@@ -59,6 +59,7 @@
 
 //examples
 :order-UC: https://github.com/OpenPEPPOL/poacc-upgrade-3/tree/master/rules/use-case-examples/order[Use case example files]
+:order-response-UC: https://github.com/OpenPEPPOL/poacc-upgrade-3/tree/master/rules/use-case-examples/order-response[Use case example files]
 :imr-UC: https://docs.peppol.eu/poacc/upgrade-3/files/PEPPOLBIS-Examples.zip[Use case example files]
 :examples-zip: http://test-docs.peppol.eu/poacc/upgrade-3/files/PEPPOLBIS-Examples.zip[Example files (ZIP)]
 

diff --git a/guides/transactions/01-order/description/totals.adoc b/guides/transactions/01-order/description/totals.adoc
@@ -22,13 +22,13 @@ The following elements show the anticipated monetary totals for an order:
 
 | <cbc:TaxExclusiveAmount>
 | Order total amount without TAX
-| stem:[\ \ \ \ "cac:LegalMonetaryTotal/cbc:LineExtensionAmount"] +
-stem:[– \ "cac:LegalMonetaryTotal/cbc:AllowanceTotalAmount"] +
-stem:[+ \ "cac:LegalMonetaryTotal/cbc:ChargeTotalAmount"]
+| stem:[\ \ \ \ "cac:AnticipatedMonetaryTotal/cbc:LineExtensionAmount"] +
+stem:[– \ "cac:AnticipatedMonetaryTotal/cbc:AllowanceTotalAmount"] +
+stem:[+ \ "cac:AnticipatedMonetaryTotal/cbc:ChargeTotalAmount"]
 
 | <cbc:TaxInclusiveAmount>
 | Order total amount included TAX
-| stem:[\ \ \ \ "cac:LegalMonetaryTotal/cbc:TaxExclusiveAmount"] +
+| stem:[\ \ \ \ "cac:AnticipatedMonetaryTotal/cbc:TaxExclusiveAmount"] +
 stem:[+ \ "cac:TaxTotal/cbc:TaxAmount"]
 
 | <cbc:PrepaidAmount>
@@ -41,9 +41,9 @@ stem:[+ \ "cac:TaxTotal/cbc:TaxAmount"]
 
 | <cbc:PayableAmount>
 | The amount that is expected to be paid
-| stem:[\ \ \ \ "cac:LegalMonetaryTotal/cbc:TaxInclusiveAmount"] +
-stem:[- \ "cac:LegalMonetaryTotal/cbc:PrepaidAmount"] +
-stem:[+ \ "cac:LegalMonetaryTotal/cbc:PayableRoundingAmount"]
+| stem:[\ \ \ \ "cac:AnticipatedMonetaryTotal/cbc:TaxInclusiveAmount"] +
+stem:[- \ "cac:AnticipatedMonetaryTotal/cbc:PrepaidAmount"] +
+stem:[+ \ "cac:AnticipatedMonetaryTotal/cbc:PayableRoundingAmount"]
 |===
 
 

diff --git a/guides/transactions/19-catalogue/description/quantitiesandunits.adoc b/guides/transactions/19-catalogue/description/quantitiesandunits.adoc
@@ -1,27 +1,14 @@
 [[quantities-and-units]]
 == Quantities and units
 
-The table below lists quantities and units in the format.
-To all quantities there must be a legal Unit according to the Code list.
+The table below lists quantities and units in the catalogue transaction. All quantities must be based on a Unit Of Measure (UOM) according UNECE Recommendation 20 and Recommendation 21 for UOM.
 For xml-examples for quantities and units, we refer to {examples-zip}.
 
-[cols=",",options="header",]
-|====
-|*Element /xPath* |*Description*
-|/cac:CatalogueLine/cbc:OrderableUnit |Unit code for the line item.
-Mandatory if the item is orderable.
-Code according to Code list
-|/cac:CatalogueLine/cbc:ContentUnitQuantity |Quantity in consumable unit E.g. millilitre in bottle of shampoo.
-|/cac:CatalogueLine/cbc:OrderQuantityIncrementNumeric |Possible limitation to the number of articles that can be ordered.
-If the Quantity increment is 6 the article must be ordered in a quantity of 6, 12, 18 etc.
-|/cac:CatalogueLine/cbc:MinimumOrderQuantity |The smallest number of items that can be ordered (most often 1).
-|/cac:CatalogueLine/cbc:MaximumOrderQuantity |The largest number of items that can be ordered (most often not used).
-|/cac:CatalogueLine/cac:ItemComparison/cbc:Quantity |Quantity related to Price comparison.
-|/cac:CatalogueLine/cac:Item/cbc:PackQuantity |Number of items on next lower level, e.g. number of Consumer units in a Trading unit.
-|/cac:CatalogueLine/cac:Item/cbc:PackSizeNumeric |Number of Consumer units.
-E.g. number of bottles on a Pallet.
-|====
+Following are two examples showing the use of different elements.
+
+Example 1: Bottles that contain 250m of shampoo are packed in cases, 6 bottles in each case. The cases are stacked 18 on each pallet. The minimum order quantity is always one unit.
 
+Example 2: Printing paper is sold in packs of 500 sheets. 6 packs of paper are packed in cases and 18 cases are stacked on a pallet. Minimum order quantity is one unit.
 
 [cols=",,,",options="header",]
 |====
@@ -31,21 +18,25 @@ image:images/image6.png[image,width=55,height=117]
 image:images/image8.png[image,width=121,height=78]
 |*Pallet of 18 cases* +
 image:images/image7.png[image,width=146,height=127]
-|*Line identifier* |4 |5 |6
-|*Supplier Item identifier* |1111 |111 |11
-|*Item Name* |Shampoo 250 ml |6x250 ml Shampoo |Shampoo
-|*Orderable unit* |EA |CS |PF
-|*Packaging level* |CU |TU |DU
-|*Packed units* |  |EA |CS
-|*Packed quantity* |  |6 |18
-|*Consumable unit* |EA |EA |EA
-|*Consumable unit quantity* |1 |6 |108
-|*ItemNetQuantity* |250 |1500 |27000
-|*Unit* |MLT |MLT |MLT
-|*MinimumOrderQuantity* |1 |1 |1
-|*Unit* |EA |EA |EA
-|*Component related item Identifier* |  |1111 |111
-|*Component related item quantity* |  |6 |18
+|*Line identifier* (tir19-032) |4 |5 |6
+|*Seller Item identifier* (tir19-091) |1111 |111 |11
+|*Item Name* (tir19-078) |Shampoo 250 ml |6x250 ml Shampoo |Shampoo
+|*Orderable unit* (tir19-035) |EA |CS |PF
+||||
+|*Packaging level* (tir19-102) |CU |TU |DU
+|*Packed quantity* (tir19-066) |  |6 |18
+|*-Packed units* |  |EA |CS
+||||
+|*Consumable unit quantity* (tir19-036) |1 |6 |108
+||||
+|*ItemNetQuantity* (tir19-061) |250 |1500 |27000
+|*-Unit* |MLT |MLT |MLT
+||||
+|*MinimumOrderQuantity* (tir19-038) |1 |1 |1
+|*-Unit* |EA |EA |EA
+||||
+|*Component related item Identifier* (tir19-045) |  |1111 |111
+|*Component related item quantity* (tir19-046) |  |6 |18
 |====
 
 [cols=",,,",options="header",]
@@ -55,19 +46,46 @@ image:images/image7.png[image,width=146,height=127]
 
 *copypaper*
 
-|*Line identifier* |7 |8 |9
-|*Supplier Item identifier* |A |AA |AAA
-|*Item Name* |500 copy paper |5*500 Copy paper |Pallet of paper
-|*Orderable unit* |EA |CS |PX
-|*Packaging level* |CU |TU |DU
-|*Packed units* |  |EA |EA
-|*Packed quantity* |  |5 |18
-|*Consumable unit* |EA |EA |EA
-|*Consumable unit quantity* |1 |5 |90
-|*ItemNetQuantity* |500 |2500 |45000
-|*Unit* |EA |EA |EA
-|*MinimumOrderQuantity* |1 |1 |1
-|*Unit* |EA |EA |EA
-|*Component related item Identifier* |  |A |AA
-|*Component related item quantity* |  |5 |18
+|*Line identifier* (tir19-032)|7 |8 |9
+|*Seller Item identifier* (tir19-091)|A |AA |AAA
+|*Item Name* (tir19-078)|500 copy paper |5*500 Copy paper |Pallet of paper
+|*Orderable unit* (tir19-035)|EA |CS |PX
+||||
+|*Packaging level* (tir19-102)|CU |TU |DU
+|*Packed quantity* (tir19-066)|  |5 |18
+|*-Packed units* |  |EA |EA
+||||
+
+|*Consumable unit quantity* (tir19-036)|1 |5 |90
+||||
+|*ItemNetQuantity* (tir19-061)|500 |2500 |45000
+|*-Unit* |EA |EA |EA
+||||
+|*MinimumOrderQuantity* (tir19-038)|1 |1 |1
+|*-Unit* |EA |EA |EA
+||||
+|*Component related item Identifier* (tir19-045)|  |A |AA
+|*Component related item quantity* (tir19-046)|  |5 |18
+|====
+
+Following table shows the definition of the business terms shown in the example as well as their syntax binding.
+
+[cols="1,5,5",options="header",]
+|====
+|Id|*Description* |*Element /xPath*
+|tir19-032|Each line must have an identifier that is unique within the document to make it possible to positively reference the line. For example, from other documents.| /cac:CatalogueLine/cbc:ID
+|tir19-091|An identifier, assigned by the seller, for the item. Associates the item with its identification according to the seller's system. |/cac:CatalogueLine/cac:Item/cac:SellersItemIdentification/cbc:ID
+|tir19-078|A short name for an item.|/cac:CatalogueLine/cac:Item/cbc:Name
+|tir19-035|The unit in which the item described in this catalogue line can be ordered. The same item can be described in more than one catalogue line with different orderble units. E.g. catalogue line 1 describes item X that can be ordered in boxes at a given price. Line 2 may describe the same item X as orderable in pallets where the price is lower.|/cac:CatalogueLine/cbc:OrderableUnit
+|tir19-102|The packing level of the catalogue line.| cac:CatalogueLine/cbc:PackLevelCode
+|tir19-066|The number of packed units that are in the orderable unit. E.g. if the orderable unit is a pallet that contains 30 boxes then the packed units are BOX and the packed quantity is 30.|/cac:CatalogueLine/cac:Item/cbc:PackQuantity
+|UOM|The prepacking the article is available in inside the orderable unit (next lower level packing), and which contains the number of unit described in PackSizeNumeric. Unit desciption to PackQuantity. The value shoud be a valid UOM code like XCS for case.|/cac:CatalogueLine/cac:Item/cbc:PackQuantity/@unitCode
+|tir19-036|Specifies the number of consumable units that are in each orderable unit.|/cac:CatalogueLine/cac:Item/cbc:PackSizeNumeric 
+|tir19-061|The net quantity of the item that is contained in each consumable unit, excluding any packaging materials.|/cac:CatalogueLine/cbc:ContentUnitQuantity 
+|UOM|The unit of measure that applies to the item net quantity|cac:CatalogueLine cbc:ContentUnitQuantity @unitCode
+|tir19-038|The minimum number of orderable units that can be ordered according to details provided in the catalogue line, such as price.|/cac:CatalogueLine/cbc:MinimumOrderQuantity 
+|UOM|The unit of measure that applies to the minimum order quantity|/cac:CatalogueLine/cbc:MinimumOrderQuantity/@unitCode
+|tir19-045|The sellers identifier for the related item.|cac:CatalogueLine/cac:ComponentRelatedItem/cbc:ID
+|tir19-046|The quantity that applies to the relationship.|cac:CatalogueLine/cac:ComponentRelatedItem/cbc:Quantity
+
 |====
diff --git a/rules/sch/parts/PEPPOL-M-T16.sch b/rules/sch/parts/PEPPOL-M-T16.sch
@@ -16,12 +16,12 @@
 	<rule context="cac:SellerSupplierParty">
 		<assert id="PEPPOL-T16-R009"
 			test="(cac:Party/cac:PartyName/cbc:Name) or (cac:Party/cac:PartyIdentification/cbc:ID)"
-			flag="fatal">A despatch advice buyer party SHALL contain the name or an identifier</assert>
+			flag="fatal">A despatch advice seller party SHALL contain the name or an identifier</assert>
 	</rule>
 	<rule context="cac:OriginatorCustomerParty">
 		<assert id="PEPPOL-T16-R010"
 			test="(cac:Party/cac:PartyName/cbc:Name) or (cac:Party/cac:PartyIdentification/cbc:ID)"
-			flag="fatal">A despatch advice buyer party SHALL contain the name or an identifier</assert>
+			flag="fatal">A despatch advice originator customer party SHALL contain the name or an identifier</assert>
 	</rule>
 
 	<rule context="cac:DespatchLine">