Merge pull request #377 from invopop/pt-common-tags

PT: Fix invoice tags

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to GOBL will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). See also the [GOBL versions](https://docs.gobl.org/overview/versions) documentation site for more details.
 
+## [v0.200.1]
+
+### Fixed
+
+- `pt`: moving invoice tags from saft addon to regime, ensure defaults present.
+
 ## [v0.200.0]
 
 Another ~~significant~~ epic release. Introducing "add-ons" which move the normalization and validation rules from Tax Regimes to specific packages that need to be enabled inside a document to be used.

addons/pt/saft/saft.go

@@ -23,9 +23,6 @@ func newAddon() *tax.AddonDef {
 			i18n.EN: "Portugal SAF-T",
 		},
 		Extensions: extensions,
-		Tags: []*tax.TagSet{
-			invoiceTags,
-		},
 		Normalizer: normalize,
 		Scenarios:  scenarios,
 		Validator:  validate,

addons/pt/saft/scenarios.go

@@ -3,32 +3,14 @@ package saft
 import (
 	"github.com/invopop/gobl/bill"
 	"github.com/invopop/gobl/cbc"
-	"github.com/invopop/gobl/i18n"
+	"github.com/invopop/gobl/regimes/pt"
 	"github.com/invopop/gobl/tax"
 )
 
-// Invoice type tags
-const (
-	TagInvoiceReceipt cbc.Key = "invoice-receipt"
-)
-
 var scenarios = []*tax.ScenarioSet{
 	invoiceScenarios,
 }
 
-var invoiceTags = &tax.TagSet{
-	Schema: bill.ShortSchemaInvoice,
-	List: []*cbc.KeyDefinition{
-		{
-			Key: TagInvoiceReceipt,
-			Name: i18n.String{
-				i18n.EN: "Invoice-receipt",
-				i18n.PT: "Fatura-recibo",
-			},
-		},
-	},
-}
-
 var invoiceScenarios = &tax.ScenarioSet{
 	Schema: bill.ShortSchemaInvoice,
 	List: []*tax.Scenario{
@@ -52,7 +34,7 @@ var invoiceScenarios = &tax.ScenarioSet{
 				if !ok {
 					return false
 				}
-				return inv.HasTags(TagInvoiceReceipt) || inv.Totals.Paid()
+				return inv.HasTags(pt.TagInvoiceReceipt) || inv.Totals.Paid()
 			},
 			Ext: tax.Extensions{
 				ExtKeyInvoiceType: "FR",

data/addons/pt-saft-v1.json

@@ -292,20 +292,6 @@
       ]
     }
   ],
-  "tags": [
-    {
-      "schema": "bill/invoice",
-      "list": [
-        {
-          "key": "invoice-receipt",
-          "name": {
-            "en": "Invoice-receipt",
-            "pt": "Fatura-recibo"
-          }
-        }
-      ]
-    }
-  ],
   "scenarios": [
     {
       "schema": "bill/invoice",

data/regimes/pt.json

@@ -7,6 +7,71 @@
   "time_zone": "Europe/Lisbon",
   "country": "PT",
   "currency": "EUR",
+  "tags": [
+    {
+      "schema": "bill/invoice",
+      "list": [
+        {
+          "key": "simplified",
+          "name": {
+            "de": "Vereinfachte Rechnung",
+            "en": "Simplified Invoice",
+            "es": "Factura Simplificada",
+            "it": "Fattura Semplificata"
+          },
+          "desc": {
+            "de": "Wird für B2C-Transaktionen verwendet, wenn die Kundendaten nicht verfügbar sind. Bitte wenden Sie sich an die örtlichen Behörden, um die Grenzwerte zu ermitteln.",
+            "en": "Used for B2C transactions when the client details are not available, check with local authorities for limits.",
+            "es": "Usado para transacciones B2C cuando los detalles del cliente no están disponibles, consulte con las autoridades locales para los límites.",
+            "it": "Utilizzato per le transazioni B2C quando i dettagli del cliente non sono disponibili, controllare con le autorità locali per i limiti."
+          }
+        },
+        {
+          "key": "reverse-charge",
+          "name": {
+            "de": "Umkehr der Steuerschuld",
+            "en": "Reverse Charge",
+            "es": "Inversión del Sujeto Pasivo",
+            "it": "Inversione del soggetto passivo"
+          }
+        },
+        {
+          "key": "self-billed",
+          "name": {
+            "de": "Rechnung durch den Leistungsempfänger",
+            "en": "Self-billed",
+            "es": "Facturación por el destinatario",
+            "it": "Autofattura"
+          }
+        },
+        {
+          "key": "customer-rates",
+          "name": {
+            "de": "Kundensätze",
+            "en": "Customer rates",
+            "es": "Tarifas aplicables al destinatario",
+            "it": "Aliquote applicabili al destinatario"
+          }
+        },
+        {
+          "key": "partial",
+          "name": {
+            "de": "Teilweise",
+            "en": "Partial",
+            "es": "Parcial",
+            "it": "Parziale"
+          }
+        },
+        {
+          "key": "invoice-receipt",
+          "name": {
+            "en": "Invoice-receipt",
+            "pt": "Fatura-recibo"
+          }
+        }
+      ]
+    }
+  ],
   "extensions": [
     {
       "key": "pt-region",

regimes/pt/invoices.go

@@ -2,12 +2,32 @@ package pt
 
 import (
 	"github.com/invopop/gobl/bill"
+	"github.com/invopop/gobl/cbc"
+	"github.com/invopop/gobl/i18n"
 	"github.com/invopop/gobl/num"
 	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl/tax"
 	"github.com/invopop/validation"
 )
 
+// Invoice type tags
+const (
+	TagInvoiceReceipt cbc.Key = "invoice-receipt"
+)
+
+var invoiceTags = &tax.TagSet{
+	Schema: bill.ShortSchemaInvoice,
+	List: []*cbc.KeyDefinition{
+		{
+			Key: TagInvoiceReceipt,
+			Name: i18n.String{
+				i18n.EN: "Invoice-receipt",
+				i18n.PT: "Fatura-recibo",
+			},
+		},
+	},
+}
+
 type invoiceValidator struct {
 	inv *bill.Invoice
 }

regimes/pt/invoices_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/invopop/gobl/cal"
 	"github.com/invopop/gobl/num"
 	"github.com/invopop/gobl/org"
+	"github.com/invopop/gobl/regimes/pt"
 	"github.com/invopop/gobl/tax"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -51,6 +52,14 @@ func TestValidInvoice(t *testing.T) {
 	require.NoError(t, inv.Validate())
 }
 
+func TestValidSimplifiedInvoice(t *testing.T) {
+	inv := validInvoice()
+	inv.SetTags(tax.TagSimplified, pt.TagInvoiceReceipt)
+	inv.Customer = nil
+	require.NoError(t, inv.Calculate())
+	require.NoError(t, inv.Validate())
+}
+
 func TestLineValidation(t *testing.T) {
 	inv := validInvoice()
 	inv.Lines[0].Quantity = num.MakeAmount(-1, 0)

regimes/pt/pt.go

@@ -6,6 +6,7 @@ import (
 	"github.com/invopop/gobl/cbc"
 	"github.com/invopop/gobl/currency"
 	"github.com/invopop/gobl/i18n"
+	"github.com/invopop/gobl/regimes/common"
 	"github.com/invopop/gobl/tax"
 )
 
@@ -42,6 +43,9 @@ func New() *tax.RegimeDef {
 		Extensions: extensionKeys,
 		Validator:  Validate,
 		Normalizer: Normalize,
+		Tags: []*tax.TagSet{
+			common.InvoiceTags().Merge(invoiceTags),
+		},
 		Corrections: []*tax.CorrectionDefinition{
 			{
 				Schema: bill.ShortSchemaInvoice,

version.go

@@ -8,7 +8,7 @@ import (
 type Version string
 
 // VERSION is the current version of the GOBL library.
-const VERSION Version = "v0.200.0"
+const VERSION Version = "v0.200.1"
 
 // Semver parses and returns semver
 func (v Version) Semver() *semver.Version {