Fix: missing tax totals

invopop · Jan 29, 2025 · 53d4a02 · 53d4a02
1 parent 10c0f2b
commit 53d4a02
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/doc/breakdown.go b/doc/breakdown.go
@@ -94,6 +94,9 @@ type taxInfo struct {
 }
 
 func newTipoDesglose(gobl *bill.Invoice) *TipoDesglose {
+	if gobl.Totals == nil || gobl.Totals.Taxes == nil {
+		return nil
+	}
 	catTotal := gobl.Totals.Taxes.Category(tax.CategoryVAT)
 	if catTotal == nil {
 		return nil
@@ -265,7 +268,7 @@ func (t taxInfo) isNoSujeta(r *tax.RateTotal) bool {
 	if t.customerRates {
 		return true
 	}
-	return r.Percent == nil && r.Ext[tbai.ExtKeyExemption].Code().In(notSubjectExemptionCodes...)
+	return r.Percent == nil && r.Ext[tbai.ExtKeyExemption].In(notSubjectExemptionCodes...)
 }
 
 func (t taxInfo) causaNoSujeta(r *tax.RateTotal) string {
@@ -276,5 +279,5 @@ func (t taxInfo) causaNoSujeta(r *tax.RateTotal) string {
 }
 
 func (taxInfo) isExenta(r *tax.RateTotal) bool {
-	return r.Percent == nil && !r.Ext[tbai.ExtKeyExemption].Code().In(notSubjectExemptionCodes...)
+	return r.Percent == nil && !r.Ext[tbai.ExtKeyExemption].In(notSubjectExemptionCodes...)
 }
diff --git a/doc/invoice.go b/doc/invoice.go
@@ -3,8 +3,8 @@ package doc
 import (
 	"github.com/invopop/gobl/addons/es/tbai"
 	"github.com/invopop/gobl/bill"
-	"github.com/invopop/gobl/cbc"
 	"github.com/invopop/gobl/num"
+	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl/regimes/es"
 	"github.com/invopop/gobl/tax"
 )
@@ -109,13 +109,13 @@ func newDatosFactura(inv *bill.Invoice) (*DatosFactura, error) {
 	}, nil
 }
 
-func newDescription(notes []*cbc.Note) (string, error) {
+func newDescription(notes []*org.Note) (string, error) {
 	for _, note := range notes {
-		if note.Key == cbc.NoteKeyGeneral {
+		if note.Key == org.NoteKeyGeneral {
 			return note.Text, nil
 		}
 	}
-	return "", validationErr(`notes: missing note with key '%s'`, cbc.NoteKeyGeneral)
+	return "", validationErr(`notes: missing note with key '%s'`, org.NoteKeyGeneral)
 }
 
 func newImporteTotal(inv *bill.Invoice) string {

diff --git a/doc/invoice_test.go b/doc/invoice_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/invopop/gobl/addons/es/tbai"
 	"github.com/invopop/gobl/bill"
 	"github.com/invopop/gobl/cal"
-	"github.com/invopop/gobl/cbc"
 	"github.com/invopop/gobl/num"
 	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl/regimes/es"
@@ -67,8 +66,8 @@ func TestFacturaConversion(t *testing.T) {
 
 	t.Run("should fill invoice description from general note", func(t *testing.T) {
 		goblInvoice := test.LoadInvoice("sample-invoice.json")
-		goblInvoice.Notes = []*cbc.Note{
-			{Key: cbc.NoteKeyGeneral, Text: "Description of invoice"},
+		goblInvoice.Notes = []*org.Note{
+			{Key: org.NoteKeyGeneral, Text: "Description of invoice"},
 		}
 
 		invoice, _ := doc.NewTicketBAI(goblInvoice, ts, role, doc.ZoneBI)
@@ -79,7 +78,7 @@ func TestFacturaConversion(t *testing.T) {
 
 	t.Run("should return error if no description (general note) found", func(t *testing.T) {
 		goblInvoice := test.LoadInvoice("sample-invoice.json")
-		goblInvoice.Notes = []*cbc.Note{}
+		goblInvoice.Notes = []*org.Note{}
 
 		_, err := doc.NewTicketBAI(goblInvoice, ts, role, doc.ZoneBI)
 

diff --git a/doc/parties.go b/doc/parties.go
@@ -75,7 +75,7 @@ func newDestinatario(party *org.Party) (*IDDestinatario, error) {
 	}
 
 	if len(party.Addresses) > 0 && party.Addresses[0].Code != "" {
-		d.CodigoPostal = party.Addresses[0].Code
+		d.CodigoPostal = party.Addresses[0].Code.String()
 		d.Direccion = formatAddress(party.Addresses[0])
 	}
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.1
 
 require (
 	github.com/go-resty/resty/v2 v2.13.1
-	github.com/invopop/gobl v0.204.2-0.20241105091334-a418e60fb2b5
+	github.com/invopop/gobl v0.208.0
 	github.com/invopop/xmldsig v0.10.0
 	github.com/joho/godotenv v1.5.1
 	github.com/lestrrat-go/libxml2 v0.0.0-20231124114421-99c71026c2f5

diff --git a/go.sum b/go.sum
@@ -26,6 +26,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/invopop/gobl v0.204.2-0.20241105091334-a418e60fb2b5 h1:MLlwU4olYRx1FFa5pLur6PTTaXdaLfT7gscZ6DjkxTw=
 github.com/invopop/gobl v0.204.2-0.20241105091334-a418e60fb2b5/go.mod h1:DmPohPel8b3ta4nDKnXRNzWQlB89cN74e0/WwPUEZUU=
+github.com/invopop/gobl v0.208.0 h1:qy5GHXELMy7qBtvgLL8m4d/aBgBaxq0bdAaae4a2luE=
+github.com/invopop/gobl v0.208.0/go.mod h1:DmPohPel8b3ta4nDKnXRNzWQlB89cN74e0/WwPUEZUU=
 github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
 github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/invopop/validation v0.7.0 h1:NBPLqvYGmLZLQuk5jh0PbaBBetJW7f2VEk/BTWJkGBU=