upgrade to GOBL v0.207.0

invopop · Dec 12, 2024 · fe53dd5 · fe53dd5
1 parent 9c5beb2
commit fe53dd5
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 205 deletions.
diff --git a/components/bill/invoice/helpers.go b/components/bill/invoice/helpers.go
@@ -7,7 +7,7 @@ import (
 
 // HasHeaderQR returns a boolean indicating whether the envelope has some QR codes to be displayed in the header or not.
 func HasHeaderQR(env *gobl.Envelope) bool {
-	hasVerifactu, _, _ := es.HasVerifactuQR(env)
+	hasVerifactu, _ := es.HasVerifactuQR(env)
 	hasTicketBAI, _, _ := es.HasTicketBAIQR(env)
 	return hasVerifactu || hasTicketBAI
 }
diff --git a/components/bill/invoice/line_support.go b/components/bill/invoice/line_support.go
@@ -41,12 +41,12 @@ func prepareLineSupport(inv *bill.Invoice) *lineSupport {
 		}
 	}
 	for _, row := range inv.Discounts {
-		if row.Ref != "" {
+		if row.Code != "" {
 			ls.refs = true
 		}
 	}
 	for _, row := range inv.Charges {
-		if row.Ref != "" {
+		if row.Code != "" {
 			ls.refs = true
 		}
 	}

diff --git a/components/bill/invoice/lines.templ b/components/bill/invoice/lines.templ
@@ -2,10 +2,9 @@ package invoice
 
 import (
 	"fmt"
-
-	"github.com/invopop/gobl/bill"
-	"github.com/invopop/gobl.html/components/t"
 	"github.com/invopop/gobl.html/components/regimes/mx"
+	"github.com/invopop/gobl.html/components/t"
+	"github.com/invopop/gobl/bill"
 )
 
 templ lines(inv *bill.Invoice) {
@@ -191,8 +190,8 @@ templ discountRow(row *bill.Discount, ls *lineSupport) {
 		</td>
 		if ls.refs {
 			<td class="ref">
-				if row.Ref != "" {
-					{ row.Ref }
+				if row.Code != "" {
+					{ row.Code.String() }
 				} else {
 					<!-- empty -->
 				}
@@ -262,8 +261,8 @@ templ chargeRow(row *bill.Charge, ls *lineSupport) {
 		</td>
 		if ls.refs {
 			<td class="ref">
-				if row.Ref != "" {
-					{ row.Ref }
+				if row.Code != "" {
+					{ row.Code.String() }
 				} else {
 					<!-- empty -->
 				}

diff --git a/components/bill/invoice/lines_templ.go b/components/bill/invoice/lines_templ.go
diff --git a/components/bill/invoice/payment.templ b/components/bill/invoice/payment.templ
@@ -45,7 +45,7 @@ templ paymentInstructions(inst *pay.Instructions) {
 						@t.T(".ref")
 					</span>
 					<span class="value">
-						{ inst.Ref }
+						{ inst.Ref.String() }
 					</span>
 				</li>
 			}

diff --git a/components/bill/invoice/payment_templ.go b/components/bill/invoice/payment_templ.go
diff --git a/components/bill/invoice/summary.templ b/components/bill/invoice/summary.templ
@@ -8,7 +8,6 @@ import (
 	"github.com/invopop/gobl/cal"
 	"github.com/invopop/gobl/cbc"
 	"github.com/invopop/gobl/currency"
-	"github.com/invopop/gobl/tax"
 	"strings"
 )
 
@@ -150,7 +149,7 @@ func currencyName(ctx context.Context, cur currency.Code) string {
 	return i18n.T(ctx, "billing.invoice.summary.currency_value", i18n.M{"desc": name, "code": cur})
 }
 
-func mapTaxExtension(ctx context.Context, k cbc.Key, v tax.ExtValue) string {
+func mapTaxExtension(ctx context.Context, k cbc.Key, v cbc.Code) string {
 	// find the key translation
 	label := i18n.T(ctx, ".ext_map."+k.String())
 	if strings.HasPrefix(label, "!") { // if match found

diff --git a/components/bill/invoice/summary_templ.go b/components/bill/invoice/summary_templ.go
diff --git a/components/bill/invoice/totals.templ b/components/bill/invoice/totals.templ
@@ -99,18 +99,6 @@ templ totalsBaseRows(inv *bill.Invoice, totals *bill.Totals) {
 }
 
 templ totalsPayableRows(inv *bill.Invoice, totals *bill.Totals) {
-	if totals.Outlays != nil {
-		for _, o := range inv.Outlays {
-			<tr class="outlay">
-				<th>
-					@t.T(".outlay", i18n.M{"i": o.Index, "txt": outlayText(o)})
-				</th>
-				<td>
-					@t.LM(o.Amount)
-				</td>
-			</tr>
-		}
-	}
 	<tr class="payable strong">
 		<th>
 			if inv.Type.In(bill.InvoiceTypeCreditNote) {
@@ -204,14 +192,3 @@ func advanceMap(adv *pay.Advance) i18n.M {
 	}
 	return i18n.M{"date": date, "txt": txt}
 }
-
-func outlayText(outlay *bill.Outlay) string {
-	txt := outlay.Description
-	if outlay.Code != "" {
-		txt = outlay.Code + " " + txt
-	}
-	if outlay.Date != nil {
-		txt += " " + outlay.Date.String()
-	}
-	return txt
-}
diff --git a/components/bill/invoice/totals_templ.go b/components/bill/invoice/totals_templ.go