diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 78843bb43..cc865406c 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -574,10 +574,18 @@ abstract class InvoiceItemEntity extends Object return null; } - InvoiceItemEntity applyTax(TaxRateEntity taxRate) { - InvoiceItemEntity item = rebuild((b) => b - ..taxRate1 = taxRate.rate - ..taxName1 = taxRate.name); + InvoiceItemEntity applyTax(TaxRateEntity taxRate, {bool isSecond = false}) { + InvoiceItemEntity item; + + if (isSecond) { + item = rebuild((b) => b + ..taxRate2 = taxRate.rate + ..taxName2 = taxRate.name); + } else { + item = rebuild((b) => b + ..taxRate1 = taxRate.rate + ..taxName1 = taxRate.name); + } if (taxRate.isInclusive) { item = item.rebuild( diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart index 9c425937a..3e3c71415 100644 --- a/lib/ui/invoice/edit/invoice_edit_items.dart +++ b/lib/ui/invoice/edit/invoice_edit_items.dart @@ -300,7 +300,7 @@ class ItemEditDetailsState extends State { ? TaxRateDropdown( taxRates: company.taxRates, onSelected: (taxRate) => viewModel.onChangedInvoiceItem( - invoiceItem.applyTax(taxRate), widget.index), + invoiceItem.applyTax(taxRate, isSecond: true), widget.index), labelText: localization.tax, initialTaxName: invoiceItem.taxName2, initialTaxRate: invoiceItem.taxRate2,