Model fixes

lib/data/models/client_model.dart

@@ -131,7 +131,6 @@ abstract class ClientEntity extends Object
   String get groupId;
 
   @nullable
-  @BuiltValueField(serialize: false)
   int get lastUpdatedActivities;
 
   bool get areActivitiesLoaded =>

lib/data/models/client_model.g.dart

@@ -215,13 +215,13 @@ class _$ClientEntitySerializer implements StructuredSerializer<ClientEntity> {
       serializers.serialize(object.gatewayTokens,
           specifiedType: const FullType(
               BuiltList, const [const FullType(GatewayTokenEntity)])),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
+    if (object.lastUpdatedActivities != null) {
+      result
+        ..add('lastUpdatedActivities')
+        ..add(serializers.serialize(object.lastUpdatedActivities,
+            specifiedType: const FullType(int)));
+    }
     if (object.isChanged != null) {
       result
         ..add('isChanged')
@@ -234,6 +234,18 @@ class _$ClientEntitySerializer implements StructuredSerializer<ClientEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -276,6 +288,10 @@ class _$ClientEntitySerializer implements StructuredSerializer<ClientEntity> {
           result.groupId = serializers.deserialize(value,
               specifiedType: const FullType(String)) as String;
           break;
+        case 'lastUpdatedActivities':
+          result.lastUpdatedActivities = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
         case 'name':
           result.name = serializers.deserialize(value,
               specifiedType: const FullType(String)) as String;
@@ -496,12 +512,6 @@ class _$ContactEntitySerializer implements StructuredSerializer<ContactEntity> {
       'custom_value4',
       serializers.serialize(object.customValue4,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.password != null) {
       result
@@ -527,6 +537,18 @@ class _$ContactEntitySerializer implements StructuredSerializer<ContactEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -1084,12 +1106,6 @@ class _$ClientEntity extends ClientEntity {
     if (gatewayTokens == null) {
       throw new BuiltValueNullFieldError('ClientEntity', 'gatewayTokens');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ClientEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ClientEntity', 'archivedAt');
-    }
   }
 
   @override
@@ -1672,12 +1688,6 @@ class _$ContactEntity extends ContactEntity {
     if (customValue4 == null) {
       throw new BuiltValueNullFieldError('ContactEntity', 'customValue4');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ContactEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ContactEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/company_gateway_model.g.dart

@@ -165,12 +165,6 @@ class _$CompanyGatewayEntitySerializer
       'config',
       serializers.serialize(object.config,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -184,6 +178,18 @@ class _$CompanyGatewayEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -741,12 +747,6 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity {
     if (config == null) {
       throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'config');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('CompanyGatewayEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/company_model.g.dart

@@ -185,12 +185,6 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
       'settings',
       serializers.serialize(object.settings,
           specifiedType: const FullType(SettingsEntity)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.plan != null) {
       result
@@ -222,6 +216,18 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -2889,12 +2895,6 @@ class _$CompanyEntity extends CompanyEntity {
     if (settings == null) {
       throw new BuiltValueNullFieldError('CompanyEntity', 'settings');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('CompanyEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('CompanyEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/credit_model.g.dart

@@ -131,12 +131,6 @@ class _$CreditEntitySerializer implements StructuredSerializer<CreditEntity> {
       'client_id',
       serializers.serialize(object.clientId,
           specifiedType: const FullType(int)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -150,6 +144,18 @@ class _$CreditEntitySerializer implements StructuredSerializer<CreditEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -517,12 +523,6 @@ class _$CreditEntity extends CreditEntity {
     if (clientId == null) {
       throw new BuiltValueNullFieldError('CreditEntity', 'clientId');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('CreditEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('CreditEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/document_model.g.dart

@@ -137,12 +137,6 @@ class _$DocumentEntitySerializer
       'is_default',
       serializers.serialize(object.isDefault,
           specifiedType: const FullType(bool)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.invoiceId != null) {
       result
@@ -204,6 +198,18 @@ class _$DocumentEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -639,12 +645,6 @@ class _$DocumentEntity extends DocumentEntity {
     if (isDefault == null) {
       throw new BuiltValueNullFieldError('DocumentEntity', 'isDefault');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('DocumentEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('DocumentEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/entities.dart

@@ -176,9 +176,11 @@ abstract class BaseEntity implements SelectableEntity {
   @BuiltValueField(wireName: 'created_at')
   int get createdAt;
 
+  @nullable
   @BuiltValueField(wireName: 'updated_at')
   int get updatedAt;
 
+  @nullable
   @BuiltValueField(wireName: 'archived_at')
   int get archivedAt;
 

lib/data/models/expense_model.g.dart

@@ -188,12 +188,6 @@ class _$ExpenseEntitySerializer implements StructuredSerializer<ExpenseEntity> {
       'custom_value2',
       serializers.serialize(object.customValue2,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.categoryId != null) {
       result
@@ -243,6 +237,18 @@ class _$ExpenseEntitySerializer implements StructuredSerializer<ExpenseEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -450,12 +456,6 @@ class _$ExpenseCategoryEntitySerializer
     final result = <Object>[
       'name',
       serializers.serialize(object.name, specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -469,6 +469,18 @@ class _$ExpenseCategoryEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -973,12 +985,6 @@ class _$ExpenseEntity extends ExpenseEntity {
     if (customValue2 == null) {
       throw new BuiltValueNullFieldError('ExpenseEntity', 'customValue2');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ExpenseEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ExpenseEntity', 'archivedAt');
-    }
   }
 
   @override
@@ -1413,12 +1419,6 @@ class _$ExpenseCategoryEntity extends ExpenseCategoryEntity {
     if (name == null) {
       throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'name');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ExpenseCategoryEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/gateway_token_model.g.dart

@@ -132,12 +132,6 @@ class _$GatewayTokenEntitySerializer
       'is_default',
       serializers.serialize(object.isDefault,
           specifiedType: const FullType(bool)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -151,6 +145,18 @@ class _$GatewayTokenEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -494,12 +500,6 @@ class _$GatewayTokenEntity extends GatewayTokenEntity {
     if (isDefault == null) {
       throw new BuiltValueNullFieldError('GatewayTokenEntity', 'isDefault');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('GatewayTokenEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('GatewayTokenEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/group_model.g.dart

@@ -114,12 +114,6 @@ class _$GroupEntitySerializer implements StructuredSerializer<GroupEntity> {
       'settings',
       serializers.serialize(object.settings,
           specifiedType: const FullType(SettingsEntity)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -133,6 +127,18 @@ class _$GroupEntitySerializer implements StructuredSerializer<GroupEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -446,12 +452,6 @@ class _$GroupEntity extends GroupEntity {
     if (settings == null) {
       throw new BuiltValueNullFieldError('GroupEntity', 'settings');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('GroupEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('GroupEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/invoice_model.g.dart

@@ -222,12 +222,6 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
       serializers.serialize(object.invitations,
           specifiedType: const FullType(
               BuiltList, const [const FullType(InvitationEntity)])),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.clientId != null) {
       result
@@ -301,6 +295,18 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -760,12 +766,6 @@ class _$InvitationEntitySerializer
       'viewed_date',
       serializers.serialize(object.viewedDate,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -779,6 +779,18 @@ class _$InvitationEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -1325,12 +1337,6 @@ class _$InvoiceEntity extends InvoiceEntity {
     if (invitations == null) {
       throw new BuiltValueNullFieldError('InvoiceEntity', 'invitations');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'archivedAt');
-    }
   }
 
   @override
@@ -2295,12 +2301,6 @@ class _$InvitationEntity extends InvitationEntity {
     if (viewedDate == null) {
       throw new BuiltValueNullFieldError('InvitationEntity', 'viewedDate');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('InvitationEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('InvitationEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/payment_model.g.dart

@@ -152,12 +152,6 @@ class _$PaymentEntitySerializer implements StructuredSerializer<PaymentEntity> {
       serializers.serialize(object.credits,
           specifiedType: const FullType(
               BuiltList, const [const FullType(PaymentableEntity)])),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.number != null) {
       result
@@ -243,6 +237,18 @@ class _$PaymentEntitySerializer implements StructuredSerializer<PaymentEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -823,12 +829,6 @@ class _$PaymentEntity extends PaymentEntity {
     if (credits == null) {
       throw new BuiltValueNullFieldError('PaymentEntity', 'credits');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('PaymentEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('PaymentEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/product_model.g.dart

@@ -156,12 +156,6 @@ class _$ProductEntitySerializer implements StructuredSerializer<ProductEntity> {
       'custom_value2',
       serializers.serialize(object.customValue2,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.customValue3 != null) {
       result
@@ -199,6 +193,18 @@ class _$ProductEntitySerializer implements StructuredSerializer<ProductEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -655,12 +661,6 @@ class _$ProductEntity extends ProductEntity {
     if (customValue2 == null) {
       throw new BuiltValueNullFieldError('ProductEntity', 'customValue2');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ProductEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ProductEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/project_model.g.dart

@@ -147,12 +147,6 @@ class _$ProjectEntitySerializer implements StructuredSerializer<ProjectEntity> {
       'custom_value4',
       serializers.serialize(object.customValue4,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -166,6 +160,18 @@ class _$ProjectEntitySerializer implements StructuredSerializer<ProjectEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -564,12 +570,6 @@ class _$ProjectEntity extends ProjectEntity {
     if (customValue4 == null) {
       throw new BuiltValueNullFieldError('ProjectEntity', 'customValue4');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('ProjectEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('ProjectEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/quote_model.g.dart

@@ -233,12 +233,6 @@ class _$QuoteEntitySerializer implements StructuredSerializer<QuoteEntity> {
       serializers.serialize(object.invitations,
           specifiedType: const FullType(
               BuiltList, const [const FullType(InvitationEntity)])),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.invoiceNumber != null) {
       result
@@ -276,6 +270,18 @@ class _$QuoteEntitySerializer implements StructuredSerializer<QuoteEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -557,12 +563,6 @@ class _$InvitationEntitySerializer
       'viewed_date',
       serializers.serialize(object.viewedDate,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -576,6 +576,18 @@ class _$InvitationEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -1142,12 +1154,6 @@ class _$QuoteEntity extends QuoteEntity {
     if (invitations == null) {
       throw new BuiltValueNullFieldError('QuoteEntity', 'invitations');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('QuoteEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('QuoteEntity', 'archivedAt');
-    }
   }
 
   @override
@@ -1753,12 +1759,6 @@ class _$InvitationEntity extends InvitationEntity {
     if (viewedDate == null) {
       throw new BuiltValueNullFieldError('InvitationEntity', 'viewedDate');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('InvitationEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('InvitationEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/task_model.g.dart

@@ -179,12 +179,6 @@ class _$TaskEntitySerializer implements StructuredSerializer<TaskEntity> {
       'custom_value2',
       serializers.serialize(object.customValue2,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.invoiceId != null) {
       result
@@ -246,6 +240,18 @@ class _$TaskEntitySerializer implements StructuredSerializer<TaskEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -797,12 +803,6 @@ class _$TaskEntity extends TaskEntity {
     if (customValue2 == null) {
       throw new BuiltValueNullFieldError('TaskEntity', 'customValue2');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('TaskEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('TaskEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/tax_rate_model.g.dart

@@ -122,12 +122,6 @@ class _$TaxRateEntitySerializer implements StructuredSerializer<TaxRateEntity> {
       serializers.serialize(object.name, specifiedType: const FullType(String)),
       'rate',
       serializers.serialize(object.rate, specifiedType: const FullType(double)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -141,6 +135,18 @@ class _$TaxRateEntitySerializer implements StructuredSerializer<TaxRateEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -459,12 +465,6 @@ class _$TaxRateEntity extends TaxRateEntity {
     if (rate == null) {
       throw new BuiltValueNullFieldError('TaxRateEntity', 'rate');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('TaxRateEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('TaxRateEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/user_model.g.dart

@@ -121,12 +121,6 @@ class _$UserEntitySerializer implements StructuredSerializer<UserEntity> {
       'phone',
       serializers.serialize(object.phone,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.customValue1 != null) {
       result
@@ -170,6 +164,18 @@ class _$UserEntitySerializer implements StructuredSerializer<UserEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -539,12 +545,6 @@ class _$UserEntity extends UserEntity {
     if (phone == null) {
       throw new BuiltValueNullFieldError('UserEntity', 'phone');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('UserEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('UserEntity', 'archivedAt');
-    }
   }
 
   @override

lib/data/models/vendor_model.g.dart

@@ -162,12 +162,6 @@ class _$VendorEntitySerializer implements StructuredSerializer<VendorEntity> {
       serializers.serialize(object.contacts,
           specifiedType: const FullType(
               BuiltList, const [const FullType(VendorContactEntity)])),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.currencyId != null) {
       result
@@ -187,6 +181,18 @@ class _$VendorEntitySerializer implements StructuredSerializer<VendorEntity> {
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -368,12 +374,6 @@ class _$VendorContactEntitySerializer
       'phone',
       serializers.serialize(object.phone,
           specifiedType: const FullType(String)),
-      'updated_at',
-      serializers.serialize(object.updatedAt,
-          specifiedType: const FullType(int)),
-      'archived_at',
-      serializers.serialize(object.archivedAt,
-          specifiedType: const FullType(int)),
     ];
     if (object.isChanged != null) {
       result
@@ -387,6 +387,18 @@ class _$VendorContactEntitySerializer
         ..add(serializers.serialize(object.createdAt,
             specifiedType: const FullType(int)));
     }
+    if (object.updatedAt != null) {
+      result
+        ..add('updated_at')
+        ..add(serializers.serialize(object.updatedAt,
+            specifiedType: const FullType(int)));
+    }
+    if (object.archivedAt != null) {
+      result
+        ..add('archived_at')
+        ..add(serializers.serialize(object.archivedAt,
+            specifiedType: const FullType(int)));
+    }
     if (object.isDeleted != null) {
       result
         ..add('is_deleted')
@@ -810,12 +822,6 @@ class _$VendorEntity extends VendorEntity {
     if (contacts == null) {
       throw new BuiltValueNullFieldError('VendorEntity', 'contacts');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('VendorEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('VendorEntity', 'archivedAt');
-    }
   }
 
   @override
@@ -1202,12 +1208,6 @@ class _$VendorContactEntity extends VendorContactEntity {
     if (phone == null) {
       throw new BuiltValueNullFieldError('VendorContactEntity', 'phone');
     }
-    if (updatedAt == null) {
-      throw new BuiltValueNullFieldError('VendorContactEntity', 'updatedAt');
-    }
-    if (archivedAt == null) {
-      throw new BuiltValueNullFieldError('VendorContactEntity', 'archivedAt');
-    }
   }
 
   @override

lib/ui/app/forms/decorated_form_field.dart

@@ -19,6 +19,7 @@ class DecoratedFormField extends StatelessWidget {
     this.enabled = true,
     this.hint,
     this.expands = false,
+    this.autofocus = false,
   }) : super(key: key);
 
   final TextEditingController controller;
@@ -34,6 +35,7 @@ class DecoratedFormField extends StatelessWidget {
   final bool autocorrect;
   final bool obscureText;
   final bool expands;
+  final bool autofocus;
   final TextInputAction textInputAction;
   final ValueChanged<String> onFieldSubmitted;
   final ValueChanged<String> onChanged;
@@ -43,6 +45,7 @@ class DecoratedFormField extends StatelessWidget {
     return TextFormField(
       key: ValueKey(label),
       controller: controller,
+      autofocus: autofocus,
       decoration: InputDecoration(
         labelText: label,
         hintText: hint,

lib/ui/group/view/group_view.dart

@@ -239,9 +239,11 @@ class SettingsViewer extends StatelessWidget {
       localization.counterPadding: settings.counterPadding?.toString(),
       localization.sharedInvoiceQuoteCounter:
           settings.sharedInvoiceQuoteCounter?.toString(),
-      //localization.defaultInvoiceTerms: settings.defaultInvoiceTerms,
+      localization.invoiceTerms: settings.defaultInvoiceTerms,
-      //localization.defaultQuoteTerms: settings.defaultQuoteTerms,
+      localization.quoteTerms: settings.defaultQuoteTerms,
-      localization.quoteFooter: settings.defaultQuoteFooter?.toString(),
+      localization.quoteFooter: settings.defaultQuoteFooter,
+      localization.creditTerms: settings.defaultCreditTerms,
+      localization.creditFooter: settings.defaultCreditFooter,
       localization.invoiceTaxRates:
           settings.numberOfInvoiceTaxRates?.toString(),
       localization.itemTaxRates: settings.numberOfItemTaxRates?.toString(),

lib/utils/platforms.dart

@@ -38,10 +38,8 @@ AppLayout calculateLayout(BuildContext context) {
 
   if (size < kMobileLayoutWidth) {
     return AppLayout.mobile;
-  } else if (size > kTabletLayoutWidth) {
-    return AppLayout.desktop;
   } else {
-    return AppLayout.tablet;
+    return AppLayout.desktop;
   }
 }