diff --git a/cmd/gobl/testdata/Test_build_do_not_envelop b/cmd/gobl/testdata/Test_build_do_not_envelop
index 79a9c91..56e6d98 100644
--- a/cmd/gobl/testdata/Test_build_do_not_envelop
+++ b/cmd/gobl/testdata/Test_build_do_not_envelop
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://gobl.org/draft-0/bill/invoice",
 	"uuid": "00000000-0000-0000-0000-000000000000",
-	"code": "INV2021-001",
 	"type": "standard",
-	"currency": "EUR",
+	"code": "INV2021-001",
 	"issue_date": "2021-06-16",
+	"currency": "EUR",
 	"supplier": {
 		"name": "A Company Name S.L.",
 		"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_envelop b/cmd/gobl/testdata/Test_build_envelop
index 5d30876..bbc5283 100644
--- a/cmd/gobl/testdata/Test_build_envelop
+++ b/cmd/gobl/testdata/Test_build_envelop
@@ -11,10 +11,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "00000000-0000-0000-0000-000000000000",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_explicit_stdout b/cmd/gobl/testdata/Test_build_explicit_stdout
index 3168676..7c0fbe4 100644
--- a/cmd/gobl/testdata/Test_build_explicit_stdout
+++ b/cmd/gobl/testdata/Test_build_explicit_stdout
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_input_file b/cmd/gobl/testdata/Test_build_input_file
index 3168676..7c0fbe4 100644
--- a/cmd/gobl/testdata/Test_build_input_file
+++ b/cmd/gobl/testdata/Test_build_input_file
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_merge_values b/cmd/gobl/testdata/Test_build_merge_values
index ef7636d..4de9927 100644
--- a/cmd/gobl/testdata/Test_build_merge_values
+++ b/cmd/gobl/testdata/Test_build_merge_values
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-005X",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-005X",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_output_file_outfile b/cmd/gobl/testdata/Test_build_output_file_outfile
index 3168676..7c0fbe4 100644
--- a/cmd/gobl/testdata/Test_build_output_file_outfile
+++ b/cmd/gobl/testdata/Test_build_output_file_outfile
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile b/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
index a76fadf..89852e0 100644
--- a/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
+++ b/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile b/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
index 3168676..7c0fbe4 100644
--- a/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
+++ b/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_recalculate b/cmd/gobl/testdata/Test_build_recalculate
index e9e4687..06b0747 100644
--- a/cmd/gobl/testdata/Test_build_recalculate
+++ b/cmd/gobl/testdata/Test_build_recalculate
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_success b/cmd/gobl/testdata/Test_build_success
index e9e4687..06b0747 100644
--- a/cmd/gobl/testdata/Test_build_success
+++ b/cmd/gobl/testdata/Test_build_success
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_build_valid_file b/cmd/gobl/testdata/Test_build_valid_file
index 275e5c7..f33032f 100644
--- a/cmd/gobl/testdata/Test_build_valid_file
+++ b/cmd/gobl/testdata/Test_build_valid_file
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Different Company S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_explicit_stdout b/cmd/gobl/testdata/Test_sign_explicit_stdout
index 3b46b3e..930b1be 100644
--- a/cmd/gobl/testdata/Test_sign_explicit_stdout
+++ b/cmd/gobl/testdata/Test_sign_explicit_stdout
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_input_file b/cmd/gobl/testdata/Test_sign_input_file
index 3b46b3e..930b1be 100644
--- a/cmd/gobl/testdata/Test_sign_input_file
+++ b/cmd/gobl/testdata/Test_sign_input_file
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_merge_values b/cmd/gobl/testdata/Test_sign_merge_values
index 0916766..7a0c5a0 100644
--- a/cmd/gobl/testdata/Test_sign_merge_values
+++ b/cmd/gobl/testdata/Test_sign_merge_values
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-006X",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-006X",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_output_file_outfile b/cmd/gobl/testdata/Test_sign_output_file_outfile
index 3b46b3e..930b1be 100644
--- a/cmd/gobl/testdata/Test_sign_output_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_output_file_outfile
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile b/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
index 5260c9c..fe46958 100644
--- a/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile b/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
index 3b46b3e..930b1be 100644
--- a/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
@@ -9,10 +9,10 @@
 	},
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
-		"code": "SAMPLE-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "SAMPLE-001",
 		"issue_date": "2022-02-01",
+		"currency": "EUR",
 		"supplier": {
 			"name": "MªF. Services",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_recalculate b/cmd/gobl/testdata/Test_sign_recalculate
index d82c8de..0852a5d 100644
--- a/cmd/gobl/testdata/Test_sign_recalculate
+++ b/cmd/gobl/testdata/Test_sign_recalculate
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_success b/cmd/gobl/testdata/Test_sign_success
index d82c8de..0852a5d 100644
--- a/cmd/gobl/testdata/Test_sign_success
+++ b/cmd/gobl/testdata/Test_sign_success
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Company Name S.L.",
 			"tax_id": {
diff --git a/cmd/gobl/testdata/Test_sign_valid_file b/cmd/gobl/testdata/Test_sign_valid_file
index 78d85bf..3d768f6 100644
--- a/cmd/gobl/testdata/Test_sign_valid_file
+++ b/cmd/gobl/testdata/Test_sign_valid_file
@@ -10,10 +10,10 @@
 	"doc": {
 		"$schema": "https://gobl.org/draft-0/bill/invoice",
 		"uuid": "3d7fdbdc-d037-11eb-a068-3e7e00ce5635",
-		"code": "INV2021-001",
 		"type": "standard",
-		"currency": "EUR",
+		"code": "INV2021-001",
 		"issue_date": "2021-06-16",
+		"currency": "EUR",
 		"supplier": {
 			"name": "A Different Company S.L.",
 			"tax_id": {
diff --git a/go.mod b/go.mod
index 588309f..1845e33 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/google/go-cmp v0.5.9
 	github.com/imdario/mergo v0.3.15
-	github.com/invopop/gobl v0.54.0
+	github.com/invopop/gobl v0.55.0
 	github.com/invopop/yaml v0.2.0
 	github.com/labstack/echo/v4 v4.10.2
 	github.com/magefile/mage v1.13.0
diff --git a/go.sum b/go.sum
index 5984dc9..db48f13 100644
--- a/go.sum
+++ b/go.sum
@@ -806,6 +806,8 @@ github.com/invopop/gobl v0.53.1-0.20230813095931-968e069b05b7 h1:aVz5cqyoH1Dwj40
 github.com/invopop/gobl v0.53.1-0.20230813095931-968e069b05b7/go.mod h1:/s8rsPX3RK5J/yGK41lzzzB+zXeC29rpIZBYjSjvYzM=
 github.com/invopop/gobl v0.54.0 h1:4sejjcl+p6thFoFVmi1w+yHNpHV2gbM/k9flT8q9SYk=
 github.com/invopop/gobl v0.54.0/go.mod h1:/s8rsPX3RK5J/yGK41lzzzB+zXeC29rpIZBYjSjvYzM=
+github.com/invopop/gobl v0.55.0 h1:NV62UR/W2f/mWwqhnlkjuBad/Zb64u50pDIQDBTeFnw=
+github.com/invopop/gobl v0.55.0/go.mod h1:/s8rsPX3RK5J/yGK41lzzzB+zXeC29rpIZBYjSjvYzM=
 github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So=
 github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0=
 github.com/invopop/validation v0.3.0 h1:o260kbjXzoBO/ypXDSSrCLL7SxEFUXBsX09YTE9AxZw=