Merge branch 'develop' of github.com:invoiceninja/flutter-client into develop

lib/constants.dart

@@ -4,7 +4,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.120';
+const String kClientVersion = '5.0.121';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

lib/data/repositories/credit_repository.dart

@@ -93,7 +93,9 @@ class CreditRepository {
           '${credentials.url}/credits/${credit.id}?include=activities.history';
     }
 
-    if (action == EntityAction.markSent) {
+    if (action == EntityAction.markPaid) {
+      url += '&mark_paid=true';
+    } else if (action == EntityAction.markSent) {
       url += '&mark_sent=true';
     }
 

lib/ui/app/menu_drawer.dart

@@ -1150,12 +1150,11 @@ class SidebarFooter extends StatelessWidget {
               },
               tooltip: prefState.enableTooltips ? localization.userGuide : '',
             ),
-            if (state.userCompany.isAdmin)
-              IconButton(
-                icon: Icon(Icons.info_outline),
-                onPressed: () => _showAbout(context),
-                tooltip: prefState.enableTooltips ? localization.about : '',
-              ),
+            IconButton(
+              icon: Icon(Icons.info_outline),
+              onPressed: () => _showAbout(context),
+              tooltip: prefState.enableTooltips ? localization.about : '',
+            ),
             /*
             if (kDebugMode)
               IconButton(
@@ -1566,30 +1565,32 @@ void _showAbout(BuildContext context) async {
                     color: Colors.cyan,
                     onPressed: () => launchUrl(Uri.parse(kReleaseNotesUrl)),
                   ),
-                  if (state.isSelfHosted || !kReleaseMode) ...[
-                    AppButton(
-                      label: localization.healthCheck.toUpperCase(),
-                      iconData: MdiIcons.shieldHalfFull,
-                      color: Colors.green,
-                      onPressed: () {
-                        showDialog<HealthCheckDialog>(
-                            context: context,
-                            builder: (BuildContext context) {
-                              return HealthCheckDialog();
-                            });
-                      },
-                    ),
-                    if (!state.account.disableAutoUpdate &&
-                        (!state.account.isDocker || state.isUpdateAvailable))
+                  if (state.userCompany.isAdmin) ...[
+                    if (state.isSelfHosted || !kReleaseMode) ...[
                       AppButton(
-                        label: (state.isUpdateAvailable
-                                ? localization.updateApp
-                                : localization.forceUpdate)
-                            .toUpperCase(),
-                        iconData: MdiIcons.cloudDownload,
-                        color: Colors.orange,
-                        onPressed: () => _showUpdate(context),
+                        label: localization.healthCheck.toUpperCase(),
+                        iconData: MdiIcons.shieldHalfFull,
+                        color: Colors.green,
+                        onPressed: () {
+                          showDialog<HealthCheckDialog>(
+                              context: context,
+                              builder: (BuildContext context) {
+                                return HealthCheckDialog();
+                              });
+                        },
                       ),
+                      if (!state.account.disableAutoUpdate &&
+                          (!state.account.isDocker || state.isUpdateAvailable))
+                        AppButton(
+                          label: (state.isUpdateAvailable
+                                  ? localization.updateApp
+                                  : localization.forceUpdate)
+                              .toUpperCase(),
+                          iconData: MdiIcons.cloudDownload,
+                          color: Colors.orange,
+                          onPressed: () => _showUpdate(context),
+                        ),
+                    ],
                   ],
                   if (state.company.daysActive > 30)
                     AppButton(

lib/ui/reports/reports_screen_vm.dart

@@ -676,13 +676,10 @@ GroupTotals calculateReportTotals({
             cell.currencyId != company.currencyId &&
             shouldConverCurrencies) {
           double cellValue = cell.value;
-          var rate = cell.exchangeRate;
-          if (rate == null || rate == 0 || rate == 1) {
-            rate = getExchangeRate(currencyMap,
-                fromCurrencyId: cell.currencyId,
-                toCurrencyId: company.currencyId);
-          }
           final toCurrency = currencyMap[company.currencyId];
+          final rate = getExchangeRate(currencyMap,
+              fromCurrencyId: cell.currencyId,
+              toCurrencyId: company.currencyId);
           cellValue = round(cellValue * rate, toCurrency.precision);
           totals[group][column] += cellValue;
         } else {

pubspec.foss.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.120+120
+version: 5.0.121+121
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

pubspec.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.120+120
+version: 5.0.121+121
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: invoiceninja
-version: '5.0.120'
+version: '5.0.121'
 summary: Create invoices, accept payments, track expenses & time-tasks
 description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead