Merge branch 'develop'

invoiceninja · Jul 8, 2024 · f798212 · f798212
2 parents 444c7c5 + 85d39b5
commit f798212
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 74 deletions.
diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
@@ -175,7 +175,7 @@ abstract class CompanyEntity extends Object
       transactions: BuiltList<TransactionEntity>(),
       transactionRules: BuiltList<TransactionRuleEntity>(),
       schedules: BuiltList<ScheduleEntity>(),
-      eInvoice: BuiltMap<String, dynamic>(),
+      //eInvoice: BuiltMap<String, dynamic>(),
     );
   }
 
@@ -518,8 +518,8 @@ abstract class CompanyEntity extends Object
   @BuiltValueField(wireName: 'e_invoice_certificate_passphrase')
   String get eInvoiceCertificatePassphrase;
 
-  @BuiltValueField(wireName: 'e_invoice')
-  BuiltMap<String, dynamic> get eInvoice;
+  //@BuiltValueField(wireName: 'e_invoice')
+  //BuiltMap<String, dynamic> get eInvoice;
 
   String get displayName => settings.name ?? '';
 
@@ -610,6 +610,8 @@ abstract class CompanyEntity extends Object
 
   bool get hasItemTaxes => numberOfItemTaxRates > 0;
 
+  bool get hasExpenseTaxes => numberOfExpenseTaxRates > 0;
+
   bool get hasTaxes => hasInvoiceTaxes || hasItemTaxes;
 
   bool get isSmall => !isLarge;
@@ -889,8 +891,8 @@ abstract class CompanyEntity extends Object
     ..bankAccounts.replace(BuiltList<BankAccountEntity>())
     ..transactions.replace(BuiltList<TransactionEntity>())
     ..transactionRules.replace(BuiltList<TransactionRuleEntity>())
-    ..schedules.replace(BuiltList<ScheduleEntity>())
-    ..eInvoice.replace(BuiltMap<String, dynamic>());
+    ..schedules.replace(BuiltList<ScheduleEntity>());
+    //..eInvoice.replace(BuiltMap<String, dynamic>())
 
   static Serializer<CompanyEntity> get serializer => _$companyEntitySerializer;
 }

diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
@@ -252,7 +252,7 @@ abstract class InvoiceEntity extends Object
       saveDefaultTerms: false,
       saveDefaultFooter: false,
       taxData: TaxDataEntity(),
-      eInvoice: BuiltMap<String, dynamic>(),
+      //eInvoice: BuiltMap<String, dynamic>(),
     );
   }
 
@@ -578,8 +578,8 @@ abstract class InvoiceEntity extends Object
   @BuiltValueField(wireName: 'tax_info')
   TaxDataEntity get taxData;
 
-  @BuiltValueField(wireName: 'e_invoice')
-  BuiltMap<String, dynamic> get eInvoice;
+  //@BuiltValueField(wireName: 'e_invoice')
+  //BuiltMap<String, dynamic> get eInvoice;
 
   bool get isApproved {
     if (isQuote &&
@@ -1561,7 +1561,7 @@ abstract class InvoiceEntity extends Object
     ..autoBillEnabled = false
     ..nextSendDatetime = ''
     ..taxData.replace(TaxDataEntity())
-    ..eInvoice.replace(BuiltMap<String, dynamic>())
+    //..eInvoice.replace(BuiltMap<String, dynamic>())
     ..subscriptionId = '';
 
   static Serializer<InvoiceEntity> get serializer => _$invoiceEntitySerializer;

diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart
diff --git a/lib/data/models/serializers.g.dart b/lib/data/models/serializers.g.dart
diff --git a/lib/ui/invoice/edit/invoice_item_selector.dart b/lib/ui/invoice/edit/invoice_item_selector.dart
@@ -108,8 +108,6 @@ class _InvoiceItemSelectorState extends State<InvoiceItemSelector>
 
   void _toggleEntity(BaseEntity entity) {
     setState(() {
-      _filter = '';
-      _textController.text = '';
       if (_selected.contains(entity)) {
         _selected.remove(entity);
       } else {