Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Import/Definitions/BankTransactionMap.php

@@ -16,16 +16,16 @@ class BankTransactionMap
     public static function importable()
     {
         return [
-            0 => 'bank.transaction_id',
+            0 => 'transaction.transaction_id',
-            1 => 'bank.amount',
+            1 => 'transaction.amount',
-            2 => 'bank.currency',
+            2 => 'transaction.currency',
-            3 => 'bank.account_type',
+            3 => 'transaction.account_type',
-            4 => 'bank.category_id',
+            4 => 'transaction.category_id',
-            5 => 'bank.category_type',
+            5 => 'transaction.category_type',
-            6 => 'bank.date',
+            6 => 'transaction.date',
-            7 => 'bank.bank_account_id',
+            7 => 'transaction.bank_account_id',
-            8 => 'bank.description',
+            8 => 'transaction.description',
-            9 => 'bank.base_type',
+            9 => 'transaction.base_type',
         ];
     }
 

lang/en/texts.php

@@ -4777,7 +4777,8 @@ $LANG = array(
     'invoice_task_project' => 'Invoice Task Project',
     'invoice_task_project_help' => 'Add the project to the invoice line items',
     'bulk_action' => 'Bulk Action',
-    'phone_validation_error' => 'This phone number is not valid, please enter in E.164 format',    
+    'phone_validation_error' => 'This phone number is not valid, please enter in E.164 format',
+    'transaction' => 'Transaction',    
 );
 
 return $LANG;

public/flutter_service_worker.js

@@ -11,9 +11,9 @@ const RESOURCES = {
 "favicon.png": "dca91c54388f52eded692718d5a98b8b",
 "favicon.ico": "51636d3a390451561744c42188ccd628",
 "flutter.js": "f85e6fb278b0fd20c349186fb46ae36d",
-"/": "cc64c30b7264e004824a88952ab44d44",
+"/": "e967d897188b620d029ed0219fd4dd2e",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
-"main.dart.js": "e54b6ba7da1ac4febd213b3f285a58d9",
+"main.dart.js": "2e32757dfd2b8ed40faf40347821381a",
 "assets/AssetManifest.json": "759f9ef9973f7e26c2a51450b55bb9fa",
 "assets/FontManifest.json": "087fb858dc3cbfbf6baf6a30004922f1",
 "assets/NOTICES": "1a34e70168d56fad075adfb4bdbb20eb",

public/main.dart.js

@@ -34980,7 +34980,6 @@ _.f=null},
 a82:function a82(){var _=this
 _.f=_.e=_.d=_.c=_.b=_.a=null},
 eGr(a,b,c,d,e){var s="ImportRequest"
-if(a==null)A.e(A.v(s,"bankAccountId"))
 if(e==null)A.e(A.v(s,"skipHeader"))
 if(b==null)A.e(A.v(s,"columnMap"))
 return new A.b2q(c,d,a,e,b)},
@@ -173794,9 +173793,9 @@ A.b2q.prototype={
 B(a,b){var s=this
 if(b==null)return!1
 if(b===s)return!0
-return b instanceof A.Wl&&s.a===b.a&&s.b===b.b&&s.c==b.c&&s.d==b.d&&J.m(s.e,b.e)},
+return b instanceof A.Wl&&s.a===b.a&&s.b===b.b&&s.c===b.c&&s.d==b.d&&J.m(s.e,b.e)},
 gp(a){var s=this,r=s.f
-return r==null?s.f=A.b8(A.h(A.h(A.h(A.h(A.h(0,B.c.gp(s.a)),B.c.gp(s.b)),J.r(s.c)),J.r(s.d)),J.r(s.e))):r},
+return r==null?s.f=A.b8(A.h(A.h(A.h(A.h(A.h(0,B.c.gp(s.a)),B.c.gp(s.b)),B.c.gp(s.c)),J.r(s.d)),J.r(s.e))):r},
 k(a){var s=this,r=$.bb().$1("ImportRequest"),q=J.aF(r)
 q.l(r,"hash",s.a)
 q.l(r,"importType",s.b)
@@ -254617,7 +254616,8 @@ n=i.a.d.a
 m=i.d
 p=A.d5(o,r,p)
 r=i.a.c.a
-j=A.eGr(i.r,p,n,r,m)
+l=i.r
+j=A.eGr(l==null?"":l,p,n,r,m)
 new A.hH().e6(q.a+"/import",q.b,B.H.bs($.bU().hq($.exl(),j))).N(0,new A.dqj(i,this.c),t.P).a4(new A.dqk(i,s))},
 $S:1}
 A.dqi.prototype={

public/main.foss.dart.js

@@ -34537,7 +34537,6 @@ _.f=null},
 a7j:function a7j(){var _=this
 _.f=_.e=_.d=_.c=_.b=_.a=null},
 eD3(a,b,c,d,e){var s="ImportRequest"
-if(a==null)A.e(A.u(s,"bankAccountId"))
 if(e==null)A.e(A.u(s,"skipHeader"))
 if(b==null)A.e(A.u(s,"columnMap"))
 return new A.b1c(c,d,a,e,b)},
@@ -171868,9 +171867,9 @@ A.b1c.prototype={
 B(a,b){var s=this
 if(b==null)return!1
 if(b===s)return!0
-return b instanceof A.VN&&s.a===b.a&&s.b===b.b&&s.c==b.c&&s.d==b.d&&J.m(s.e,b.e)},
+return b instanceof A.VN&&s.a===b.a&&s.b===b.b&&s.c===b.c&&s.d==b.d&&J.m(s.e,b.e)},
 gp(a){var s=this,r=s.f
-return r==null?s.f=A.b8(A.h(A.h(A.h(A.h(A.h(0,B.c.gp(s.a)),B.c.gp(s.b)),J.r(s.c)),J.r(s.d)),J.r(s.e))):r},
+return r==null?s.f=A.b8(A.h(A.h(A.h(A.h(A.h(0,B.c.gp(s.a)),B.c.gp(s.b)),B.c.gp(s.c)),J.r(s.d)),J.r(s.e))):r},
 k(a){var s=this,r=$.bb().$1("ImportRequest"),q=J.aF(r)
 q.l(r,"hash",s.a)
 q.l(r,"importType",s.b)
@@ -252461,7 +252460,8 @@ n=i.a.d.a
 m=i.d
 p=A.d2(o,r,p)
 r=i.a.c.a
-j=A.eD3(i.r,p,n,r,m)
+l=i.r
+j=A.eD3(l==null?"":l,p,n,r,m)
 new A.hO().e3(q.a+"/import",q.b,B.G.bs($.bU().hq($.eu3(),j))).N(0,new A.dna(i,this.c),t.P).a4(new A.dnb(i,s))},
 $S:1}
 A.dn9.prototype={

public/main.profile.dart.js

@@ -58195,8 +58195,6 @@
     },
     _$ImportRequest$_(bankAccountId, columnMap, hash, importType, skipHeader) {
       var _s13_ = "ImportRequest";
-      if (bankAccountId == null)
-        A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "bankAccountId"));
       if (skipHeader == null)
         A.throwExpression(A.BuiltValueNullFieldError$(_s13_, "skipHeader"));
       if (columnMap == null)
@@ -328194,12 +328192,12 @@
         return false;
       if (other === _this)
         return true;
-      return other instanceof A.ImportRequest && _this.hash === other.hash && _this.importType === other.importType && _this.bankAccountId == other.bankAccountId && _this.skipHeader == other.skipHeader && J.$eq$(_this.columnMap, other.columnMap);
+      return other instanceof A.ImportRequest && _this.hash === other.hash && _this.importType === other.importType && _this.bankAccountId === other.bankAccountId && _this.skipHeader == other.skipHeader && J.$eq$(_this.columnMap, other.columnMap);
     },
     get$hashCode(_) {
       var _this = this,
         t1 = _this._import_model$__hashCode;
-      return t1 == null ? _this._import_model$__hashCode = A.$jf(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(0, B.JSString_methods.get$hashCode(_this.hash)), B.JSString_methods.get$hashCode(_this.importType)), J.get$hashCode$(_this.bankAccountId)), J.get$hashCode$(_this.skipHeader)), J.get$hashCode$(_this.columnMap))) : t1;
+      return t1 == null ? _this._import_model$__hashCode = A.$jf(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(0, B.JSString_methods.get$hashCode(_this.hash)), B.JSString_methods.get$hashCode(_this.importType)), B.JSString_methods.get$hashCode(_this.bankAccountId)), J.get$hashCode$(_this.skipHeader)), J.get$hashCode$(_this.columnMap))) : t1;
     },
     toString$0(_) {
       var _this = this,
@@ -472375,7 +472373,8 @@
       t6 = t1._useFirstRowAsHeaders;
       t4 = A.BuiltMap_BuiltMap(convertedMapping, t3, t4);
       t3 = t1._widget.importType.name;
-      importRequest = A._$ImportRequest$_(t1._import_export$_bankAccountId, t4, t5, t3, t6);
+      t7 = t1._import_export$_bankAccountId;
+      importRequest = A._$ImportRequest$_(t7 == null ? "" : t7, t4, t5, t3, t6);
       new A.WebClient().post$3$data(credentials.url + "/import", credentials.token, B.C_JsonCodec.encode$1($.$get$serializers().serializeWith$2($.$get$_$importRequestSerializer(), importRequest))).then$1$1(0, new A.__FileMapperState_build__closure0(t1, this.localization), type$.Null).catchError$1(new A.__FileMapperState_build__closure1(t1, t2));
     },
     $signature: 1