GOBL 0.200

assets/styles/invoice.css

@@ -36,7 +36,7 @@ section.title .hero img {
 }
 section.title span.paid {
     font-size: 9pt;
-    font-weight: 600;
+    font-weight: 400;
     vertical-align: text-bottom;
     padding: 0.5mm 1.5mm;
     border-radius: 1mm;

components/bill/invoice/invoice.templ

@@ -14,6 +14,7 @@ import (
 	"github.com/invopop/gobl.html/components/t"
 	"github.com/invopop/gobl.html/internal"
 	"github.com/invopop/gobl/bill"
+	"github.com/invopop/gobl/cbc"
 	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl/tax"
 )
@@ -82,7 +83,7 @@ templ title(inv *bill.Invoice) {
 
 func i18nTitleTag(inv *bill.Invoice) string {
 	typ := string(inv.Type)
-	if inv.Tax.ContainsTag(tax.TagSimplified) && inv.Type == bill.InvoiceTypeStandard {
+	if inv.HasTags(tax.TagSimplified) && inv.Type == bill.InvoiceTypeStandard {
 		typ = typ + "-simplified"
 	}
 	return typ
@@ -113,9 +114,9 @@ func logoHeight(img *org.Image) string {
 	return "40" // pixels
 }
 
-func code(series, code string) string {
+func code(series, code cbc.Code) string {
 	if series == "" {
-		return code
+		return code.String()
 	}
 	return fmt.Sprintf("%s-%s", series, code)
 }

components/bill/invoice/line_support.go

@@ -6,7 +6,7 @@ import (
 )
 
 type lineSupport struct {
-	categories []*tax.Category
+	categories []*tax.CategoryDef
 	discounts  bool
 	charges    bool
 	refs       bool
@@ -17,9 +17,9 @@ type lineSupport struct {
 // some of the columns that will need to be shown
 func prepareLineSupport(inv *bill.Invoice) *lineSupport {
 	ls := new(lineSupport)
-	r := inv.TaxRegime()
+	r := inv.RegimeDef()
 
-	cats := make([]*tax.Category, 0)
+	cats := make([]*tax.CategoryDef, 0)
 	for _, l := range inv.Lines {
 		if len(l.Discounts) > 0 {
 			ls.discounts = true
@@ -34,7 +34,7 @@ func prepareLineSupport(inv *bill.Invoice) *lineSupport {
 			ls.units = true
 		}
 		for _, combo := range l.Taxes {
-			cat := r.Category(combo.Category)
+			cat := r.CategoryDef(combo.Category)
 			if cat != nil {
 				cats = addCategory(cats, cat)
 			}
@@ -57,7 +57,7 @@ func prepareLineSupport(inv *bill.Invoice) *lineSupport {
 }
 
 // addCategory if not there already
-func addCategory(cats []*tax.Category, cat *tax.Category) []*tax.Category {
+func addCategory(cats []*tax.CategoryDef, cat *tax.CategoryDef) []*tax.CategoryDef {
 	for _, c := range cats {
 		if c.Code == cat.Code {
 			return cats

components/bill/invoice/summary.templ

@@ -104,7 +104,7 @@ templ summaryOrderingRows(inv *bill.Invoice) {
 				@t.T(".order")
 			</span>
 			<span class="value">
-				{ inv.Ordering.Code }
+				{ inv.Ordering.Code.String() }
 			</span>
 		</li>
 	}

components/bill/invoice/taxes.templ

@@ -96,8 +96,11 @@ func taxCategoryRowSpan(ct *tax.CategoryTotal, row int) int {
 }
 
 func taxCategoryTotalName(ctx context.Context, inv *bill.Invoice, cat *tax.CategoryTotal) string {
-	r := inv.TaxRegime()
-	category := r.Category(cat.Code)
+	r := inv.RegimeDef()
+	category := r.CategoryDef(cat.Code)
+	if category == nil {
+		return cat.Code.String()
+	}
 	return category.Name.In(t.Lang(ctx))
 }
 

components/bill/invoice/totals.templ

@@ -174,8 +174,11 @@ func totalPricesIncludeTax(ctx context.Context, inv *bill.Invoice) string {
 	if inv.Tax == nil || inv.Tax.PricesInclude == "" {
 		return ""
 	}
-	r := inv.TaxRegime()
-	category := r.Category(inv.Tax.PricesInclude)
+	r := inv.RegimeDef()
+	category := r.CategoryDef(inv.Tax.PricesInclude)
+	if category == nil {
+		return inv.Tax.PricesInclude.String()
+	}
 	return category.Name.In(t.Lang(ctx))
 }
 

components/org/address.templ

@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	"github.com/invopop/ctxi18n/i18n"
-	"github.com/invopop/gobl/l10n"
 	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl.html/components/t"
 )
@@ -73,7 +72,7 @@ func buildStreetWithNumbers(addr *org.Address) string {
 func addrNumberFirst(addr *org.Address) bool {
 	// TODO: add more countries here!
 	switch addr.Country {
-	case l10n.GB, l10n.US, l10n.CA, l10n.FR:
+	case "GB", "US", "CA", "FR":
 		return true
 	default:
 		return false

components/org/party.templ

@@ -11,7 +11,6 @@ import (
 	"github.com/invopop/gobl.html/components/regimes/co"
 	"github.com/invopop/gobl.html/components/t"
 	"github.com/invopop/gobl/cbc"
-	"github.com/invopop/gobl/l10n"
 	"github.com/invopop/gobl/org"
 	"github.com/invopop/gobl/tax"
 )
@@ -169,17 +168,17 @@ func showTaxID(party *org.Party) bool {
 func taxIDLabel(ctx context.Context, party *org.Party) string {
 	tID := party.TaxID
 	switch tID.Country {
-	case l10n.ES:
+	case "ES":
 		return "NIF"
-	case l10n.CO:
+	case "CO":
 		return "NIT"
-	case l10n.MX:
+	case "MX":
 		return "RFC"
-	case l10n.FR:
+	case "FR":
 		return "TVA"
-	case l10n.PT:
+	case "PT":
 		return "NIF"
-	case l10n.IT:
+	case "IT":
 		return "P.IVA"
 	default:
 		return i18n.T(ctx, ".labels.default")
@@ -190,7 +189,7 @@ func taxIDCode(party *org.Party) string {
 	tID := party.TaxID
 	code := tID.Code.String()
 	switch tID.Country {
-	case l10n.CO:
+	case "CO":
 		return co.FormatTaxIDCode(code)
 	default:
 		return tID.Code.String()