Refactor

lib/constants.dart

@@ -3,3 +3,5 @@ const String kAppVersion = '0.0.1';
 
 const int kMaxRecordsPerApiPage = 5000;
 const int kMillisecondsToRefreshData = 1000 * 60 * 15; // 15 minutes
+
+const int kCurrencyEuro = 3;

lib/data/models/client_model.dart

@@ -40,6 +40,7 @@ class ClientFields {
 abstract class ClientEntity extends Object with BaseEntity implements Built<ClientEntity, ClientEntityBuilder> {
 
   static int counter = 0;
+
   factory ClientEntity() {
     return _$ClientEntity._(
         id: --ClientEntity.counter,

lib/data/models/entities.dart

@@ -170,24 +170,146 @@ abstract class StaticData implements Built<StaticData, StaticDataBuilder> {
 
 abstract class CompanyEntity implements Built<CompanyEntity, CompanyEntityBuilder> {
 
-  @nullable
   String get name;
-
-  //@BuiltValueField(wireName: 'account_key')
-  //String get companyKey;
-
-  @nullable
   String get token;
-
-  @nullable
   String get plan;
 
-  @nullable
   @BuiltValueField(wireName: 'logo_url')
   String get logoUrl;
 
+  @BuiltValueField(wireName: 'currency_id')
+  int get currencyId;
+
+  @BuiltValueField(wireName: 'timezone_id')
+  int get timezoneId;
+
+  @BuiltValueField(wireName: 'date_format_id')
+  int get dateFormatId;
+
+  @BuiltValueField(wireName: 'datetime_format_id')
+  int get datetimeFormatId;
+
+  @BuiltValueField(wireName: 'invoice_terms')
+  String get defaultInvoiceTerms;
+
+  @BuiltValueField(wireName: 'invoice_taxes')
+  bool get enableInvoiceTaxes;
+
+  @BuiltValueField(wireName: 'invoice_item_taxes')
+  bool get enableInvoiceItemTaxes;
+
+  @BuiltValueField(wireName: 'invoice_design_id')
+  int get defaultInvoiceDesignId;
+
+  @BuiltValueField(wireName: 'quote_design_id')
+  int get defaultQuoteDesignId;
+
+  @BuiltValueField(wireName: 'language_id')
+  int get languageId;
+
+  @BuiltValueField(wireName: 'invoice_footer')
+  String get defaultInvoiceFooter;
+
+  @BuiltValueField(wireName: 'show_item_taxes')
+  bool get showInvoiceItemTaxes;
+
+  @BuiltValueField(wireName: 'military_time')
+  bool get enableMilitaryTime;
+
+  @BuiltValueField(wireName: 'tax_name1')
+  String get defaultTaxName1;
+
+  @BuiltValueField(wireName: 'tax_rate1')
+  double get defaultTaxRate1;
+
+  @BuiltValueField(wireName: 'tax_name2')
+  String get defaultTaxName2;
+
+  @BuiltValueField(wireName: 'tax_rate2')
+  double get defaultTaxRate2;
+
+  @BuiltValueField(wireName: 'quote_terms')
+  String get defaultQuoteTerms;
+
+  @BuiltValueField(wireName: 'show_currency_code')
+  bool get showCurrencyCode;
+
+  @BuiltValueField(wireName: 'enable_second_tax_rate')
+  bool get enableSecondTaxRate;
+
+  @BuiltValueField(wireName: 'start_of_week')
+  int get startOfWeek;
+
+  @BuiltValueField(wireName: 'financial_year_start')
+  int get financialYearStart;
+
+  @BuiltValueField(wireName: 'enabled_modules')
+  int get enabledModules;
+
+  @BuiltValueField(wireName: 'payment_terms')
+  int get defaultPaymentTerms;
+
+  @BuiltValueField(wireName: 'payment_type_id')
+  int get defaultPaymentTypeId;
+
+  @BuiltValueField(wireName: 'task_rate')
+  double get defaultTaskRate;
+
+  @BuiltValueField(wireName: 'inclusive_taxes')
+  bool get enableInclusiveTaxes;
+
+  @BuiltValueField(wireName: 'convert_products')
+  bool get convertProductExchangeRate;
+
+  @BuiltValueField(wireName: 'custom_invoice_taxes1')
+  bool get enableCustomInvoiceTaxes1;
+
+  @BuiltValueField(wireName: 'custom_invoice_taxes1')
+  bool get enableCustomInvoiceTaxes2;
+
+  //@BuiltValueField(wireName: 'custom_fields')
+  //@BuiltValueField(wireName: 'invoice_labels')
+
+  factory CompanyEntity() {
+    return _$CompanyEntity._(
+      name: '',
+      token: '',
+      plan: '',
+      logoUrl: '',
+      convertProductExchangeRate: false,
+      currencyId: 1,
+      dateFormatId: 1,
+      datetimeFormatId: 1,
+      defaultInvoiceDesignId: 1,
+      defaultInvoiceFooter: '',
+      defaultInvoiceTerms: '',
+      defaultPaymentTerms: 0,
+      defaultPaymentTypeId: 0,
+      defaultQuoteDesignId: 1,
+      defaultQuoteTerms: '',
+      defaultTaskRate: 0.0,
+      defaultTaxName1: '',
+      defaultTaxRate1: 0.0,
+      defaultTaxName2: '',
+      defaultTaxRate2: 0.0,
+      enableCustomInvoiceTaxes1: false,
+      enableCustomInvoiceTaxes2: false,
+      enabledModules: 0,
+      enableInclusiveTaxes: false,
+      enableInvoiceItemTaxes: false,
+      enableInvoiceTaxes: true,
+      enableMilitaryTime: false,
+      enableSecondTaxRate: false,
+      financialYearStart: 1,
+      languageId: 1,
+      showCurrencyCode: false,
+      showInvoiceItemTaxes: false,
+      startOfWeek: 1,
+      timezoneId: 1,
+    );
+  }
+
   CompanyEntity._();
-  factory CompanyEntity([updates(CompanyEntityBuilder b)]) = _$CompanyEntity;
   static Serializer<CompanyEntity> get serializer => _$companyEntitySerializer;
 }
 

lib/data/models/entities.g.dart

@@ -448,31 +448,108 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
   @override
   Iterable serialize(Serializers serializers, CompanyEntity object,
       {FullType specifiedType: FullType.unspecified}) {
-    final result = <Object>[];
+    final result = <Object>[
-    if (object.name != null) {
+      'name',
-      result
+      serializers.serialize(object.name, specifiedType: const FullType(String)),
-        ..add('name')
+      'token',
-        ..add(serializers.serialize(object.name,
+      serializers.serialize(object.token,
-            specifiedType: const FullType(String)));
+          specifiedType: const FullType(String)),
-    }
+      'plan',
-    if (object.token != null) {
+      serializers.serialize(object.plan, specifiedType: const FullType(String)),
-      result
+      'logo_url',
-        ..add('token')
+      serializers.serialize(object.logoUrl,
-        ..add(serializers.serialize(object.token,
+          specifiedType: const FullType(String)),
-            specifiedType: const FullType(String)));
+      'currency_id',
-    }
+      serializers.serialize(object.currencyId,
-    if (object.plan != null) {
+          specifiedType: const FullType(int)),
-      result
+      'timezone_id',
-        ..add('plan')
+      serializers.serialize(object.timezoneId,
-        ..add(serializers.serialize(object.plan,
+          specifiedType: const FullType(int)),
-            specifiedType: const FullType(String)));
+      'date_format_id',
-    }
+      serializers.serialize(object.dateFormatId,
-    if (object.logoUrl != null) {
+          specifiedType: const FullType(int)),
-      result
+      'datetime_format_id',
-        ..add('logo_url')
+      serializers.serialize(object.datetimeFormatId,
-        ..add(serializers.serialize(object.logoUrl,
+          specifiedType: const FullType(int)),
-            specifiedType: const FullType(String)));
+      'invoice_terms',
-    }
+      serializers.serialize(object.defaultInvoiceTerms,
+          specifiedType: const FullType(String)),
+      'invoice_taxes',
+      serializers.serialize(object.enableInvoiceTaxes,
+          specifiedType: const FullType(bool)),
+      'invoice_item_taxes',
+      serializers.serialize(object.enableInvoiceItemTaxes,
+          specifiedType: const FullType(bool)),
+      'invoice_design_id',
+      serializers.serialize(object.defaultInvoiceDesignId,
+          specifiedType: const FullType(int)),
+      'quote_design_id',
+      serializers.serialize(object.defaultQuoteDesignId,
+          specifiedType: const FullType(int)),
+      'language_id',
+      serializers.serialize(object.languageId,
+          specifiedType: const FullType(int)),
+      'invoice_footer',
+      serializers.serialize(object.defaultInvoiceFooter,
+          specifiedType: const FullType(String)),
+      'show_item_taxes',
+      serializers.serialize(object.showInvoiceItemTaxes,
+          specifiedType: const FullType(bool)),
+      'military_time',
+      serializers.serialize(object.enableMilitaryTime,
+          specifiedType: const FullType(bool)),
+      'tax_name1',
+      serializers.serialize(object.defaultTaxName1,
+          specifiedType: const FullType(String)),
+      'tax_rate1',
+      serializers.serialize(object.defaultTaxRate1,
+          specifiedType: const FullType(double)),
+      'tax_name2',
+      serializers.serialize(object.defaultTaxName2,
+          specifiedType: const FullType(String)),
+      'tax_rate2',
+      serializers.serialize(object.defaultTaxRate2,
+          specifiedType: const FullType(double)),
+      'quote_terms',
+      serializers.serialize(object.defaultQuoteTerms,
+          specifiedType: const FullType(String)),
+      'show_currency_code',
+      serializers.serialize(object.showCurrencyCode,
+          specifiedType: const FullType(bool)),
+      'enable_second_tax_rate',
+      serializers.serialize(object.enableSecondTaxRate,
+          specifiedType: const FullType(bool)),
+      'start_of_week',
+      serializers.serialize(object.startOfWeek,
+          specifiedType: const FullType(int)),
+      'financial_year_start',
+      serializers.serialize(object.financialYearStart,
+          specifiedType: const FullType(int)),
+      'enabled_modules',
+      serializers.serialize(object.enabledModules,
+          specifiedType: const FullType(int)),
+      'payment_terms',
+      serializers.serialize(object.defaultPaymentTerms,
+          specifiedType: const FullType(int)),
+      'payment_type_id',
+      serializers.serialize(object.defaultPaymentTypeId,
+          specifiedType: const FullType(int)),
+      'task_rate',
+      serializers.serialize(object.defaultTaskRate,
+          specifiedType: const FullType(double)),
+      'inclusive_taxes',
+      serializers.serialize(object.enableInclusiveTaxes,
+          specifiedType: const FullType(bool)),
+      'convert_products',
+      serializers.serialize(object.convertProductExchangeRate,
+          specifiedType: const FullType(bool)),
+      'custom_invoice_taxes1',
+      serializers.serialize(object.enableCustomInvoiceTaxes1,
+          specifiedType: const FullType(bool)),
+      'custom_invoice_taxes1',
+      serializers.serialize(object.enableCustomInvoiceTaxes2,
+          specifiedType: const FullType(bool)),
+    ];
 
     return result;
   }
@@ -504,6 +581,126 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
           result.logoUrl = serializers.deserialize(value,
               specifiedType: const FullType(String)) as String;
           break;
+        case 'currency_id':
+          result.currencyId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'timezone_id':
+          result.timezoneId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'date_format_id':
+          result.dateFormatId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'datetime_format_id':
+          result.datetimeFormatId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'invoice_terms':
+          result.defaultInvoiceTerms = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'invoice_taxes':
+          result.enableInvoiceTaxes = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'invoice_item_taxes':
+          result.enableInvoiceItemTaxes = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'invoice_design_id':
+          result.defaultInvoiceDesignId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'quote_design_id':
+          result.defaultQuoteDesignId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'language_id':
+          result.languageId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'invoice_footer':
+          result.defaultInvoiceFooter = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'show_item_taxes':
+          result.showInvoiceItemTaxes = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'military_time':
+          result.enableMilitaryTime = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'tax_name1':
+          result.defaultTaxName1 = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'tax_rate1':
+          result.defaultTaxRate1 = serializers.deserialize(value,
+              specifiedType: const FullType(double)) as double;
+          break;
+        case 'tax_name2':
+          result.defaultTaxName2 = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'tax_rate2':
+          result.defaultTaxRate2 = serializers.deserialize(value,
+              specifiedType: const FullType(double)) as double;
+          break;
+        case 'quote_terms':
+          result.defaultQuoteTerms = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'show_currency_code':
+          result.showCurrencyCode = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'enable_second_tax_rate':
+          result.enableSecondTaxRate = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'start_of_week':
+          result.startOfWeek = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'financial_year_start':
+          result.financialYearStart = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'enabled_modules':
+          result.enabledModules = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'payment_terms':
+          result.defaultPaymentTerms = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'payment_type_id':
+          result.defaultPaymentTypeId = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
+          break;
+        case 'task_rate':
+          result.defaultTaskRate = serializers.deserialize(value,
+              specifiedType: const FullType(double)) as double;
+          break;
+        case 'inclusive_taxes':
+          result.enableInclusiveTaxes = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'convert_products':
+          result.convertProductExchangeRate = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'custom_invoice_taxes1':
+          result.enableCustomInvoiceTaxes1 = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
+        case 'custom_invoice_taxes1':
+          result.enableCustomInvoiceTaxes2 = serializers.deserialize(value,
+              specifiedType: const FullType(bool)) as bool;
+          break;
       }
     }
 
@@ -1257,12 +1454,188 @@ class _$CompanyEntity extends CompanyEntity {
   final String plan;
   @override
   final String logoUrl;
+  @override
+  final int currencyId;
+  @override
+  final int timezoneId;
+  @override
+  final int dateFormatId;
+  @override
+  final int datetimeFormatId;
+  @override
+  final String defaultInvoiceTerms;
+  @override
+  final bool enableInvoiceTaxes;
+  @override
+  final bool enableInvoiceItemTaxes;
+  @override
+  final int defaultInvoiceDesignId;
+  @override
+  final int defaultQuoteDesignId;
+  @override
+  final int languageId;
+  @override
+  final String defaultInvoiceFooter;
+  @override
+  final bool showInvoiceItemTaxes;
+  @override
+  final bool enableMilitaryTime;
+  @override
+  final String defaultTaxName1;
+  @override
+  final double defaultTaxRate1;
+  @override
+  final String defaultTaxName2;
+  @override
+  final double defaultTaxRate2;
+  @override
+  final String defaultQuoteTerms;
+  @override
+  final bool showCurrencyCode;
+  @override
+  final bool enableSecondTaxRate;
+  @override
+  final int startOfWeek;
+  @override
+  final int financialYearStart;
+  @override
+  final int enabledModules;
+  @override
+  final int defaultPaymentTerms;
+  @override
+  final int defaultPaymentTypeId;
+  @override
+  final double defaultTaskRate;
+  @override
+  final bool enableInclusiveTaxes;
+  @override
+  final bool convertProductExchangeRate;
+  @override
+  final bool enableCustomInvoiceTaxes1;
+  @override
+  final bool enableCustomInvoiceTaxes2;
 
   factory _$CompanyEntity([void updates(CompanyEntityBuilder b)]) =>
       (new CompanyEntityBuilder()..update(updates)).build();
 
-  _$CompanyEntity._({this.name, this.token, this.plan, this.logoUrl})
+  _$CompanyEntity._(
-      : super._();
+      {this.name,
+      this.token,
+      this.plan,
+      this.logoUrl,
+      this.currencyId,
+      this.timezoneId,
+      this.dateFormatId,
+      this.datetimeFormatId,
+      this.defaultInvoiceTerms,
+      this.enableInvoiceTaxes,
+      this.enableInvoiceItemTaxes,
+      this.defaultInvoiceDesignId,
+      this.defaultQuoteDesignId,
+      this.languageId,
+      this.defaultInvoiceFooter,
+      this.showInvoiceItemTaxes,
+      this.enableMilitaryTime,
+      this.defaultTaxName1,
+      this.defaultTaxRate1,
+      this.defaultTaxName2,
+      this.defaultTaxRate2,
+      this.defaultQuoteTerms,
+      this.showCurrencyCode,
+      this.enableSecondTaxRate,
+      this.startOfWeek,
+      this.financialYearStart,
+      this.enabledModules,
+      this.defaultPaymentTerms,
+      this.defaultPaymentTypeId,
+      this.defaultTaskRate,
+      this.enableInclusiveTaxes,
+      this.convertProductExchangeRate,
+      this.enableCustomInvoiceTaxes1,
+      this.enableCustomInvoiceTaxes2})
+      : super._() {
+    if (name == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'name');
+    if (token == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'token');
+    if (plan == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'plan');
+    if (logoUrl == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'logoUrl');
+    if (currencyId == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'currencyId');
+    if (timezoneId == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'timezoneId');
+    if (dateFormatId == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'dateFormatId');
+    if (datetimeFormatId == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'datetimeFormatId');
+    if (defaultInvoiceTerms == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultInvoiceTerms');
+    if (enableInvoiceTaxes == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'enableInvoiceTaxes');
+    if (enableInvoiceItemTaxes == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'enableInvoiceItemTaxes');
+    if (defaultInvoiceDesignId == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultInvoiceDesignId');
+    if (defaultQuoteDesignId == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultQuoteDesignId');
+    if (languageId == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'languageId');
+    if (defaultInvoiceFooter == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultInvoiceFooter');
+    if (showInvoiceItemTaxes == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'showInvoiceItemTaxes');
+    if (enableMilitaryTime == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'enableMilitaryTime');
+    if (defaultTaxName1 == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultTaxName1');
+    if (defaultTaxRate1 == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultTaxRate1');
+    if (defaultTaxName2 == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultTaxName2');
+    if (defaultTaxRate2 == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultTaxRate2');
+    if (defaultQuoteTerms == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultQuoteTerms');
+    if (showCurrencyCode == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'showCurrencyCode');
+    if (enableSecondTaxRate == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'enableSecondTaxRate');
+    if (startOfWeek == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'startOfWeek');
+    if (financialYearStart == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'financialYearStart');
+    if (enabledModules == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'enabledModules');
+    if (defaultPaymentTerms == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultPaymentTerms');
+    if (defaultPaymentTypeId == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'defaultPaymentTypeId');
+    if (defaultTaskRate == null)
+      throw new BuiltValueNullFieldError('CompanyEntity', 'defaultTaskRate');
+    if (enableInclusiveTaxes == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'enableInclusiveTaxes');
+    if (convertProductExchangeRate == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'convertProductExchangeRate');
+    if (enableCustomInvoiceTaxes1 == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'enableCustomInvoiceTaxes1');
+    if (enableCustomInvoiceTaxes2 == null)
+      throw new BuiltValueNullFieldError(
+          'CompanyEntity', 'enableCustomInvoiceTaxes2');
+  }
 
   @override
   CompanyEntity rebuild(void updates(CompanyEntityBuilder b)) =>
@@ -1278,14 +1651,79 @@ class _$CompanyEntity extends CompanyEntity {
     return name == other.name &&
         token == other.token &&
         plan == other.plan &&
-        logoUrl == other.logoUrl;
+        logoUrl == other.logoUrl &&
+        currencyId == other.currencyId &&
+        timezoneId == other.timezoneId &&
+        dateFormatId == other.dateFormatId &&
+        datetimeFormatId == other.datetimeFormatId &&
+        defaultInvoiceTerms == other.defaultInvoiceTerms &&
+        enableInvoiceTaxes == other.enableInvoiceTaxes &&
+        enableInvoiceItemTaxes == other.enableInvoiceItemTaxes &&
+        defaultInvoiceDesignId == other.defaultInvoiceDesignId &&
+        defaultQuoteDesignId == other.defaultQuoteDesignId &&
+        languageId == other.languageId &&
+        defaultInvoiceFooter == other.defaultInvoiceFooter &&
+        showInvoiceItemTaxes == other.showInvoiceItemTaxes &&
+        enableMilitaryTime == other.enableMilitaryTime &&
+        defaultTaxName1 == other.defaultTaxName1 &&
+        defaultTaxRate1 == other.defaultTaxRate1 &&
+        defaultTaxName2 == other.defaultTaxName2 &&
+        defaultTaxRate2 == other.defaultTaxRate2 &&
+        defaultQuoteTerms == other.defaultQuoteTerms &&
+        showCurrencyCode == other.showCurrencyCode &&
+        enableSecondTaxRate == other.enableSecondTaxRate &&
+        startOfWeek == other.startOfWeek &&
+        financialYearStart == other.financialYearStart &&
+        enabledModules == other.enabledModules &&
+        defaultPaymentTerms == other.defaultPaymentTerms &&
+        defaultPaymentTypeId == other.defaultPaymentTypeId &&
+        defaultTaskRate == other.defaultTaskRate &&
+        enableInclusiveTaxes == other.enableInclusiveTaxes &&
+        convertProductExchangeRate == other.convertProductExchangeRate &&
+        enableCustomInvoiceTaxes1 == other.enableCustomInvoiceTaxes1 &&
+        enableCustomInvoiceTaxes2 == other.enableCustomInvoiceTaxes2;
   }
 
   @override
   int get hashCode {
     return $jf($jc(
-        $jc($jc($jc(0, name.hashCode), token.hashCode), plan.hashCode),
+        $jc(
-        logoUrl.hashCode));
+            $jc(
+                $jc(
+                    $jc(
+                        $jc(
+                            $jc(
+                                $jc(
+                                    $jc(
+                                        $jc(
+                                            $jc(
+                                                $jc(
+                                                    $jc(
+                                                        $jc(
+                                                            $jc(
+                                                                $jc(
+                                                                    $jc(
+                                                                        $jc(
+                                                                            $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, name.hashCode), token.hashCode), plan.hashCode), logoUrl.hashCode), currencyId.hashCode), timezoneId.hashCode), dateFormatId.hashCode), datetimeFormatId.hashCode), defaultInvoiceTerms.hashCode), enableInvoiceTaxes.hashCode), enableInvoiceItemTaxes.hashCode), defaultInvoiceDesignId.hashCode), defaultQuoteDesignId.hashCode), languageId.hashCode), defaultInvoiceFooter.hashCode),
+                                                                                showInvoiceItemTaxes.hashCode),
+                                                                            enableMilitaryTime.hashCode),
+                                                                        defaultTaxName1.hashCode),
+                                                                    defaultTaxRate1.hashCode),
+                                                                defaultTaxName2.hashCode),
+                                                            defaultTaxRate2.hashCode),
+                                                        defaultQuoteTerms.hashCode),
+                                                    showCurrencyCode.hashCode),
+                                                enableSecondTaxRate.hashCode),
+                                            startOfWeek.hashCode),
+                                        financialYearStart.hashCode),
+                                    enabledModules.hashCode),
+                                defaultPaymentTerms.hashCode),
+                            defaultPaymentTypeId.hashCode),
+                        defaultTaskRate.hashCode),
+                    enableInclusiveTaxes.hashCode),
+                convertProductExchangeRate.hashCode),
+            enableCustomInvoiceTaxes1.hashCode),
+        enableCustomInvoiceTaxes2.hashCode));
   }
 
   @override
@@ -1294,7 +1732,37 @@ class _$CompanyEntity extends CompanyEntity {
           ..add('name', name)
           ..add('token', token)
           ..add('plan', plan)
-          ..add('logoUrl', logoUrl))
+          ..add('logoUrl', logoUrl)
+          ..add('currencyId', currencyId)
+          ..add('timezoneId', timezoneId)
+          ..add('dateFormatId', dateFormatId)
+          ..add('datetimeFormatId', datetimeFormatId)
+          ..add('defaultInvoiceTerms', defaultInvoiceTerms)
+          ..add('enableInvoiceTaxes', enableInvoiceTaxes)
+          ..add('enableInvoiceItemTaxes', enableInvoiceItemTaxes)
+          ..add('defaultInvoiceDesignId', defaultInvoiceDesignId)
+          ..add('defaultQuoteDesignId', defaultQuoteDesignId)
+          ..add('languageId', languageId)
+          ..add('defaultInvoiceFooter', defaultInvoiceFooter)
+          ..add('showInvoiceItemTaxes', showInvoiceItemTaxes)
+          ..add('enableMilitaryTime', enableMilitaryTime)
+          ..add('defaultTaxName1', defaultTaxName1)
+          ..add('defaultTaxRate1', defaultTaxRate1)
+          ..add('defaultTaxName2', defaultTaxName2)
+          ..add('defaultTaxRate2', defaultTaxRate2)
+          ..add('defaultQuoteTerms', defaultQuoteTerms)
+          ..add('showCurrencyCode', showCurrencyCode)
+          ..add('enableSecondTaxRate', enableSecondTaxRate)
+          ..add('startOfWeek', startOfWeek)
+          ..add('financialYearStart', financialYearStart)
+          ..add('enabledModules', enabledModules)
+          ..add('defaultPaymentTerms', defaultPaymentTerms)
+          ..add('defaultPaymentTypeId', defaultPaymentTypeId)
+          ..add('defaultTaskRate', defaultTaskRate)
+          ..add('enableInclusiveTaxes', enableInclusiveTaxes)
+          ..add('convertProductExchangeRate', convertProductExchangeRate)
+          ..add('enableCustomInvoiceTaxes1', enableCustomInvoiceTaxes1)
+          ..add('enableCustomInvoiceTaxes2', enableCustomInvoiceTaxes2))
         .toString();
   }
 }
@@ -1319,6 +1787,151 @@ class CompanyEntityBuilder
   String get logoUrl => _$this._logoUrl;
   set logoUrl(String logoUrl) => _$this._logoUrl = logoUrl;
 
+  int _currencyId;
+  int get currencyId => _$this._currencyId;
+  set currencyId(int currencyId) => _$this._currencyId = currencyId;
+
+  int _timezoneId;
+  int get timezoneId => _$this._timezoneId;
+  set timezoneId(int timezoneId) => _$this._timezoneId = timezoneId;
+
+  int _dateFormatId;
+  int get dateFormatId => _$this._dateFormatId;
+  set dateFormatId(int dateFormatId) => _$this._dateFormatId = dateFormatId;
+
+  int _datetimeFormatId;
+  int get datetimeFormatId => _$this._datetimeFormatId;
+  set datetimeFormatId(int datetimeFormatId) =>
+      _$this._datetimeFormatId = datetimeFormatId;
+
+  String _defaultInvoiceTerms;
+  String get defaultInvoiceTerms => _$this._defaultInvoiceTerms;
+  set defaultInvoiceTerms(String defaultInvoiceTerms) =>
+      _$this._defaultInvoiceTerms = defaultInvoiceTerms;
+
+  bool _enableInvoiceTaxes;
+  bool get enableInvoiceTaxes => _$this._enableInvoiceTaxes;
+  set enableInvoiceTaxes(bool enableInvoiceTaxes) =>
+      _$this._enableInvoiceTaxes = enableInvoiceTaxes;
+
+  bool _enableInvoiceItemTaxes;
+  bool get enableInvoiceItemTaxes => _$this._enableInvoiceItemTaxes;
+  set enableInvoiceItemTaxes(bool enableInvoiceItemTaxes) =>
+      _$this._enableInvoiceItemTaxes = enableInvoiceItemTaxes;
+
+  int _defaultInvoiceDesignId;
+  int get defaultInvoiceDesignId => _$this._defaultInvoiceDesignId;
+  set defaultInvoiceDesignId(int defaultInvoiceDesignId) =>
+      _$this._defaultInvoiceDesignId = defaultInvoiceDesignId;
+
+  int _defaultQuoteDesignId;
+  int get defaultQuoteDesignId => _$this._defaultQuoteDesignId;
+  set defaultQuoteDesignId(int defaultQuoteDesignId) =>
+      _$this._defaultQuoteDesignId = defaultQuoteDesignId;
+
+  int _languageId;
+  int get languageId => _$this._languageId;
+  set languageId(int languageId) => _$this._languageId = languageId;
+
+  String _defaultInvoiceFooter;
+  String get defaultInvoiceFooter => _$this._defaultInvoiceFooter;
+  set defaultInvoiceFooter(String defaultInvoiceFooter) =>
+      _$this._defaultInvoiceFooter = defaultInvoiceFooter;
+
+  bool _showInvoiceItemTaxes;
+  bool get showInvoiceItemTaxes => _$this._showInvoiceItemTaxes;
+  set showInvoiceItemTaxes(bool showInvoiceItemTaxes) =>
+      _$this._showInvoiceItemTaxes = showInvoiceItemTaxes;
+
+  bool _enableMilitaryTime;
+  bool get enableMilitaryTime => _$this._enableMilitaryTime;
+  set enableMilitaryTime(bool enableMilitaryTime) =>
+      _$this._enableMilitaryTime = enableMilitaryTime;
+
+  String _defaultTaxName1;
+  String get defaultTaxName1 => _$this._defaultTaxName1;
+  set defaultTaxName1(String defaultTaxName1) =>
+      _$this._defaultTaxName1 = defaultTaxName1;
+
+  double _defaultTaxRate1;
+  double get defaultTaxRate1 => _$this._defaultTaxRate1;
+  set defaultTaxRate1(double defaultTaxRate1) =>
+      _$this._defaultTaxRate1 = defaultTaxRate1;
+
+  String _defaultTaxName2;
+  String get defaultTaxName2 => _$this._defaultTaxName2;
+  set defaultTaxName2(String defaultTaxName2) =>
+      _$this._defaultTaxName2 = defaultTaxName2;
+
+  double _defaultTaxRate2;
+  double get defaultTaxRate2 => _$this._defaultTaxRate2;
+  set defaultTaxRate2(double defaultTaxRate2) =>
+      _$this._defaultTaxRate2 = defaultTaxRate2;
+
+  String _defaultQuoteTerms;
+  String get defaultQuoteTerms => _$this._defaultQuoteTerms;
+  set defaultQuoteTerms(String defaultQuoteTerms) =>
+      _$this._defaultQuoteTerms = defaultQuoteTerms;
+
+  bool _showCurrencyCode;
+  bool get showCurrencyCode => _$this._showCurrencyCode;
+  set showCurrencyCode(bool showCurrencyCode) =>
+      _$this._showCurrencyCode = showCurrencyCode;
+
+  bool _enableSecondTaxRate;
+  bool get enableSecondTaxRate => _$this._enableSecondTaxRate;
+  set enableSecondTaxRate(bool enableSecondTaxRate) =>
+      _$this._enableSecondTaxRate = enableSecondTaxRate;
+
+  int _startOfWeek;
+  int get startOfWeek => _$this._startOfWeek;
+  set startOfWeek(int startOfWeek) => _$this._startOfWeek = startOfWeek;
+
+  int _financialYearStart;
+  int get financialYearStart => _$this._financialYearStart;
+  set financialYearStart(int financialYearStart) =>
+      _$this._financialYearStart = financialYearStart;
+
+  int _enabledModules;
+  int get enabledModules => _$this._enabledModules;
+  set enabledModules(int enabledModules) =>
+      _$this._enabledModules = enabledModules;
+
+  int _defaultPaymentTerms;
+  int get defaultPaymentTerms => _$this._defaultPaymentTerms;
+  set defaultPaymentTerms(int defaultPaymentTerms) =>
+      _$this._defaultPaymentTerms = defaultPaymentTerms;
+
+  int _defaultPaymentTypeId;
+  int get defaultPaymentTypeId => _$this._defaultPaymentTypeId;
+  set defaultPaymentTypeId(int defaultPaymentTypeId) =>
+      _$this._defaultPaymentTypeId = defaultPaymentTypeId;
+
+  double _defaultTaskRate;
+  double get defaultTaskRate => _$this._defaultTaskRate;
+  set defaultTaskRate(double defaultTaskRate) =>
+      _$this._defaultTaskRate = defaultTaskRate;
+
+  bool _enableInclusiveTaxes;
+  bool get enableInclusiveTaxes => _$this._enableInclusiveTaxes;
+  set enableInclusiveTaxes(bool enableInclusiveTaxes) =>
+      _$this._enableInclusiveTaxes = enableInclusiveTaxes;
+
+  bool _convertProductExchangeRate;
+  bool get convertProductExchangeRate => _$this._convertProductExchangeRate;
+  set convertProductExchangeRate(bool convertProductExchangeRate) =>
+      _$this._convertProductExchangeRate = convertProductExchangeRate;
+
+  bool _enableCustomInvoiceTaxes1;
+  bool get enableCustomInvoiceTaxes1 => _$this._enableCustomInvoiceTaxes1;
+  set enableCustomInvoiceTaxes1(bool enableCustomInvoiceTaxes1) =>
+      _$this._enableCustomInvoiceTaxes1 = enableCustomInvoiceTaxes1;
+
+  bool _enableCustomInvoiceTaxes2;
+  bool get enableCustomInvoiceTaxes2 => _$this._enableCustomInvoiceTaxes2;
+  set enableCustomInvoiceTaxes2(bool enableCustomInvoiceTaxes2) =>
+      _$this._enableCustomInvoiceTaxes2 = enableCustomInvoiceTaxes2;
+
   CompanyEntityBuilder();
 
   CompanyEntityBuilder get _$this {
@@ -1327,6 +1940,36 @@ class CompanyEntityBuilder
       _token = _$v.token;
       _plan = _$v.plan;
       _logoUrl = _$v.logoUrl;
+      _currencyId = _$v.currencyId;
+      _timezoneId = _$v.timezoneId;
+      _dateFormatId = _$v.dateFormatId;
+      _datetimeFormatId = _$v.datetimeFormatId;
+      _defaultInvoiceTerms = _$v.defaultInvoiceTerms;
+      _enableInvoiceTaxes = _$v.enableInvoiceTaxes;
+      _enableInvoiceItemTaxes = _$v.enableInvoiceItemTaxes;
+      _defaultInvoiceDesignId = _$v.defaultInvoiceDesignId;
+      _defaultQuoteDesignId = _$v.defaultQuoteDesignId;
+      _languageId = _$v.languageId;
+      _defaultInvoiceFooter = _$v.defaultInvoiceFooter;
+      _showInvoiceItemTaxes = _$v.showInvoiceItemTaxes;
+      _enableMilitaryTime = _$v.enableMilitaryTime;
+      _defaultTaxName1 = _$v.defaultTaxName1;
+      _defaultTaxRate1 = _$v.defaultTaxRate1;
+      _defaultTaxName2 = _$v.defaultTaxName2;
+      _defaultTaxRate2 = _$v.defaultTaxRate2;
+      _defaultQuoteTerms = _$v.defaultQuoteTerms;
+      _showCurrencyCode = _$v.showCurrencyCode;
+      _enableSecondTaxRate = _$v.enableSecondTaxRate;
+      _startOfWeek = _$v.startOfWeek;
+      _financialYearStart = _$v.financialYearStart;
+      _enabledModules = _$v.enabledModules;
+      _defaultPaymentTerms = _$v.defaultPaymentTerms;
+      _defaultPaymentTypeId = _$v.defaultPaymentTypeId;
+      _defaultTaskRate = _$v.defaultTaskRate;
+      _enableInclusiveTaxes = _$v.enableInclusiveTaxes;
+      _convertProductExchangeRate = _$v.convertProductExchangeRate;
+      _enableCustomInvoiceTaxes1 = _$v.enableCustomInvoiceTaxes1;
+      _enableCustomInvoiceTaxes2 = _$v.enableCustomInvoiceTaxes2;
       _$v = null;
     }
     return this;
@@ -1347,7 +1990,40 @@ class CompanyEntityBuilder
   _$CompanyEntity build() {
     final _$result = _$v ??
         new _$CompanyEntity._(
-            name: name, token: token, plan: plan, logoUrl: logoUrl);
+            name: name,
+            token: token,
+            plan: plan,
+            logoUrl: logoUrl,
+            currencyId: currencyId,
+            timezoneId: timezoneId,
+            dateFormatId: dateFormatId,
+            datetimeFormatId: datetimeFormatId,
+            defaultInvoiceTerms: defaultInvoiceTerms,
+            enableInvoiceTaxes: enableInvoiceTaxes,
+            enableInvoiceItemTaxes: enableInvoiceItemTaxes,
+            defaultInvoiceDesignId: defaultInvoiceDesignId,
+            defaultQuoteDesignId: defaultQuoteDesignId,
+            languageId: languageId,
+            defaultInvoiceFooter: defaultInvoiceFooter,
+            showInvoiceItemTaxes: showInvoiceItemTaxes,
+            enableMilitaryTime: enableMilitaryTime,
+            defaultTaxName1: defaultTaxName1,
+            defaultTaxRate1: defaultTaxRate1,
+            defaultTaxName2: defaultTaxName2,
+            defaultTaxRate2: defaultTaxRate2,
+            defaultQuoteTerms: defaultQuoteTerms,
+            showCurrencyCode: showCurrencyCode,
+            enableSecondTaxRate: enableSecondTaxRate,
+            startOfWeek: startOfWeek,
+            financialYearStart: financialYearStart,
+            enabledModules: enabledModules,
+            defaultPaymentTerms: defaultPaymentTerms,
+            defaultPaymentTypeId: defaultPaymentTypeId,
+            defaultTaskRate: defaultTaskRate,
+            enableInclusiveTaxes: enableInclusiveTaxes,
+            convertProductExchangeRate: convertProductExchangeRate,
+            enableCustomInvoiceTaxes1: enableCustomInvoiceTaxes1,
+            enableCustomInvoiceTaxes2: enableCustomInvoiceTaxes2);
     replace(_$result);
     return _$result;
   }

lib/data/repositories/auth_repository.dart

@@ -23,7 +23,7 @@ class AuthRepository {
     };
 
     final response = await webClient.post(url + '/login?include_static=true', '', json.encode(credentials));
-    print(response);
+
     LoginResponse loginResponse = serializers.deserializeWith(
         LoginResponse.serializer, response);
 

lib/data/repositories/invoice_repository.dart

@@ -53,9 +53,6 @@ class InvoiceRepository {
     var response = await webClient.post(
           auth.url + '/email_invoice?invoice_id=${invoice.id}', company.token, null);
 
-    print('== response ==');
-    print(response.toString());
-
     InvoiceItemResponse invoiceResponse = serializers.deserializeWith(
         InvoiceItemResponse.serializer, response);
 

lib/redux/app/app_middleware.dart

@@ -218,7 +218,7 @@ List<String> _getRoutes(AppState state) {
 }
 
 _handleError(store, error, context) {
-  print(error);
+  print(error.toString());
   store.dispatch(UserLogout());
   store.dispatch(LoadUserLogin(context));
 }

lib/redux/auth/auth_middleware.dart

@@ -77,7 +77,7 @@ Middleware<AppState> _createLoginRequest(AuthRepository repository) {
         store.dispatch(UserLoginFailure('The minimum version is v4.5'));
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(UserLoginFailure(error));
     });
 

lib/redux/client/client_middleware.dart

@@ -78,7 +78,7 @@ Middleware<AppState> _archiveClient(ClientRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(ArchiveClientFailure(origClient));
     });
 
@@ -98,7 +98,7 @@ Middleware<AppState> _deleteClient(ClientRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(DeleteClientFailure(origClient));
     });
 
@@ -118,7 +118,7 @@ Middleware<AppState> _restoreClient(ClientRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(RestoreClientFailure(origClient));
     });
 
@@ -139,7 +139,7 @@ Middleware<AppState> _saveClient(ClientRepository repository) {
       }
       action.completer.complete(null);
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(SaveClientFailure(error));
     });
 
@@ -175,7 +175,7 @@ Middleware<AppState> _loadClients(ClientRepository repository) {
         store.dispatch(LoadProducts());
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(LoadClientsFailure(error));
     });
 

lib/redux/client/client_selectors.dart

@@ -27,7 +27,7 @@ List<int> dropdownClientsSelector(
     var clientB = clientMap[clientBId];
     return clientA.compareTo(clientB, ClientFields.name, true);
   });
-  print(list.toString());
+
   return list;
 }
 

lib/redux/dashboard/dashboard_middleware.dart

@@ -58,7 +58,7 @@ Middleware<AppState> _createLoadDashboard(DashboardRepository repository) {
         store.dispatch(LoadClients());
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(LoadDashboardFailure(error));
     });
 

lib/redux/invoice/invoice_middleware.dart

@@ -80,7 +80,7 @@ Middleware<AppState> _archiveInvoice(InvoiceRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(ArchiveInvoiceFailure(origInvoice));
     });
 
@@ -100,7 +100,7 @@ Middleware<AppState> _deleteInvoice(InvoiceRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(DeleteInvoiceFailure(origInvoice));
     });
 
@@ -120,7 +120,7 @@ Middleware<AppState> _restoreInvoice(InvoiceRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(RestoreInvoiceFailure(origInvoice));
     });
 
@@ -140,7 +140,7 @@ Middleware<AppState> _emailInvoice(InvoiceRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(EmailInvoiceFailure(error));
     });
 
@@ -161,7 +161,7 @@ Middleware<AppState> _saveInvoice(InvoiceRepository repository) {
       }
       action.completer.complete(null);
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(SaveInvoiceFailure(error));
     });
 
@@ -196,7 +196,7 @@ Middleware<AppState> _loadInvoices(InvoiceRepository repository) {
         store.dispatch(LoadClients());
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(LoadInvoicesFailure(error));
     });
 

lib/redux/product/product_middleware.dart

@@ -65,7 +65,7 @@ Middleware<AppState> _archiveProduct(ProductRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(ArchiveProductFailure(origProduct));
     });
 
@@ -85,7 +85,7 @@ Middleware<AppState> _deleteProduct(ProductRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(DeleteProductFailure(origProduct));
     });
 
@@ -105,7 +105,7 @@ Middleware<AppState> _restoreProduct(ProductRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(RestoreProductFailure(origProduct));
     });
 
@@ -126,7 +126,7 @@ Middleware<AppState> _saveProduct(ProductRepository repository) {
       }
       action.completer.complete(null);
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(SaveProductFailure(error));
     });
 
@@ -155,7 +155,7 @@ Middleware<AppState> _loadProducts(ProductRepository repository) {
         action.completer.complete(null);
       }
     }).catchError((error) {
-      print(error);
+      print(error.toString());
       store.dispatch(LoadProductsFailure(error));
     });
 

lib/utils/formatting.dart

@@ -1,3 +1,61 @@
+import 'package:intl/intl.dart';
+import 'package:intl/number_symbols_data.dart';
+import 'package:intl/number_symbols.dart';
+import 'package:invoiceninja/constants.dart';
+import 'package:invoiceninja/data/models/models.dart';
+
+String formatMoney(double value, {
+  CompanyEntity company,
+  CurrencyEntity currency,
+  CountryEntity country
+}) {
+
+  String thousandSeparator = currency.thousandSeparator;
+  String decimalSeparator = currency.decimalSeparator;
+  bool swapCurrencySymbol = currency.swapCurrencySymbol;
+
+  if (currency.id == kCurrencyEuro) {
+    swapCurrencySymbol = country.swapCurrencySymbol;
+    if (country.thousandSeparator.isNotEmpty) {
+      thousandSeparator = country.thousandSeparator;
+    }
+    if (country.decimalSeparator.isNotEmpty) {
+      decimalSeparator = country.decimalSeparator;
+    }
+  }
+
+  numberFormatSymbols['zz'] = new NumberSymbols(
+    NAME: "zz",
+    DECIMAL_SEP: decimalSeparator,
+    GROUP_SEP: thousandSeparator,
+    //GROUP_SEP: '\u00A0',
+    PERCENT: '%',
+    ZERO_DIGIT: '0',
+    PLUS_SIGN: '+',
+    MINUS_SIGN: '-',
+    EXP_SYMBOL: 'e',
+    PERMILL: '\u2030',
+    INFINITY: '\u221E',
+    NAN: 'NaN',
+    DECIMAL_PATTERN: '#,##0.###',
+    SCIENTIFIC_PATTERN: '#E0',
+    PERCENT_PATTERN: '#,##0%',
+    CURRENCY_PATTERN: '\u00A4#,##0.00',
+    DEF_CURRENCY_CODE: 'AUD',
+  );
+
+  var formatter = NumberFormat('###.0#', 'zz');
+  String formatted = formatter.format(value);
+
+  if (company.showCurrencyCode || currency.symbol.isEmpty) {
+    return '${formatted} ${currency.code}';
+  } else if (swapCurrencySymbol) {
+    return '${formatted} ${currency.symbol.trim()}';
+  } else {
+    return '${currency.symbol}${formatted}';
+  }
+}
+
 String cleanPhoneNumber(String phoneNumber) {
   return phoneNumber.replaceAll(RegExp(r'\D'), '');
 }

pubspec.lock

@@ -260,7 +260,7 @@ packages:
     source: hosted
     version: "3.1.2"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"

pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
   url_launcher: "^3.0.2"
   cached_network_image: "^0.4.1"
   share: "^0.5.2"
-
+  intl: "^0.15.6"
 
 dev_dependencies:
   flutter_driver: