Merge branch 'develop'

invoiceninja · Dec 4, 2024 · 4ea86cd · 4ea86cd
2 parents b2f60fd + 0e09806
commit 4ea86cd
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 16 deletions.
diff --git a/lib/data/models/tax_model.dart b/lib/data/models/tax_model.dart
@@ -132,6 +132,8 @@ abstract class TaxConfigEntity
     return _$TaxConfigEntity._(
       version: '',
       sellerSubregion: '',
+      actsAsSender: false,
+      actsAsReceiver: false,
       regions: BuiltMap<String, TaxConfigRegionEntity>(),
     );
   }
@@ -147,12 +149,20 @@ abstract class TaxConfigEntity
   @BuiltValueField(wireName: 'seller_subregion')
   String get sellerSubregion;
 
+  @BuiltValueField(wireName: 'acts_as_sender')
+  bool get actsAsSender;
+
+  @BuiltValueField(wireName: 'acts_as_receiver')
+  bool get actsAsReceiver;
+
   BuiltMap<String, TaxConfigRegionEntity> get regions;
 
   // ignore: unused_element
   static void _initializeBuilder(TaxConfigEntityBuilder builder) => builder
     ..version = ''
     ..sellerSubregion = ''
+    ..actsAsSender = false
+    ..actsAsReceiver = false
     ..regions.replace(BuiltMap<String, TaxConfigRegionEntity>());
 
   static Serializer<TaxConfigEntity> get serializer =>

diff --git a/lib/data/models/tax_model.g.dart b/lib/data/models/tax_model.g.dart
diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart
@@ -395,7 +395,6 @@ class _EditSubregionDialog extends StatefulWidget {
 
 class __EditSubregionDialogState extends State<_EditSubregionDialog> {
   String _taxName = '';
-  String _vatNumber = '';
   double? _taxRate = 0;
   double? _reducedTaxRate = 0;
 
@@ -407,7 +406,6 @@ class __EditSubregionDialogState extends State<_EditSubregionDialog> {
     _taxName = subregionConfig.taxName;
     _taxRate = subregionConfig.taxRate;
     _reducedTaxRate = subregionConfig.reducedTaxRate;
-    _vatNumber = subregionConfig.vatNumber;
   }
 
   void _onDone() {
@@ -421,13 +419,10 @@ class __EditSubregionDialogState extends State<_EditSubregionDialog> {
     viewModel.onCompanyChanged(company.rebuild((b) => b
       ..taxConfig.replace(taxConfig.rebuild((b) => b
         ..regions[widget.region] = taxConfigRegion.rebuild((b) => b
-          ..subregions[widget.subregion] = taxConfigSubregion!.rebuild(
-            (b) => b
-              ..taxName = _taxName
-              ..taxRate = _taxRate
-              ..reducedTaxRate = _reducedTaxRate
-              ..vatNumber = _vatNumber,
-          ))))));
+          ..subregions[widget.subregion] = taxConfigSubregion!.rebuild((b) => b
+            ..taxName = _taxName
+            ..taxRate = _taxRate
+            ..reducedTaxRate = _reducedTaxRate))))));
 
     Navigator.of(context).pop();
   }
@@ -475,13 +470,6 @@ class __EditSubregionDialogState extends State<_EditSubregionDialog> {
             onChanged: (value) => _reducedTaxRate = parseDouble(value),
             onSavePressed: (context) => _onDone(),
           ),
-          DecoratedFormField(
-            label: localization.vatNumber,
-            keyboardType: TextInputType.text,
-            initialValue: subregionData.vatNumber,
-            onChanged: (value) => _vatNumber = value.trim(),
-            onSavePressed: (context) => _onDone(),
-          ),
         ],
       )),
     );