Merge branch 'develop'

invoiceninja · Jan 16, 2024 · 54777d3 · 54777d3
2 parents 50f76f9 + cd118fa
commit 54777d3
Show file tree

Hide file tree

Showing 7 changed files with 2,633 additions and 9 deletions.
diff --git a/lib/constants.dart b/lib/constants.dart
@@ -820,6 +820,7 @@ const List<String> kLanguages = [
   'hr',
   'it',
   'ja',
+  'lo_LA',
   'lt',
   'lv_LV',
   'mk_MK',

diff --git a/lib/data/models/import_model.dart b/lib/data/models/import_model.dart
@@ -145,10 +145,11 @@ class ImportType extends EnumClass {
       case ImportType.csv:
         return {
           EntityType.client.apiValue: 'clients',
+          EntityType.product.apiValue: 'products',
           EntityType.invoice.apiValue: 'invoices',
           EntityType.recurringInvoice.apiValue: 'recurring_invoices',
           EntityType.payment.apiValue: 'payments',
-          EntityType.product.apiValue: 'products',
+          EntityType.task.apiValue: 'tasks',
           EntityType.vendor.apiValue: 'vendors',
           EntityType.expense.apiValue: 'expenses',
           EntityType.transaction.apiValue: 'transactions',

diff --git a/lib/data/models/transaction_model.dart b/lib/data/models/transaction_model.dart
@@ -192,6 +192,8 @@ abstract class TransactionEntity extends Object
 
   bool get isConverted => statusId == kTransactionStatusConverted;
 
+  String get formattedDescription => description.replaceAll('\n', ' ');
+
   @override
   List<EntityAction?> getActions(
       {UserCompanyEntity? userCompany,

diff --git a/lib/ui/reports/transaction_report.dart b/lib/ui/reports/transaction_report.dart
@@ -140,7 +140,7 @@ ReportResult transactionReport(
           value = transaction.date;
           break;
         case TransactionReportFields.description:
-          value = transaction.description;
+          value = transaction.formattedDescription;
           break;
         case TransactionReportFields.vendor:
           value = vendorMap[transaction.vendorId]?.name ?? '';

diff --git a/lib/ui/transaction/transaction_list_item.dart b/lib/ui/transaction/transaction_list_item.dart
@@ -116,7 +116,8 @@ class TransactionListItem extends StatelessWidget {
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Text(transaction.description, style: textStyle),
+                                Text(transaction.formattedDescription,
+                                    style: textStyle),
                                 Text(
                                   state.bankAccountState
                                       .get(transaction.bankAccountId)
@@ -193,7 +194,7 @@ class TransactionListItem extends StatelessWidget {
                     children: <Widget>[
                       Expanded(
                         child: Text(
-                          transaction.description,
+                          transaction.formattedDescription,
                           style: Theme.of(context).textTheme.titleMedium,
                         ),
                       ),

diff --git a/lib/ui/transaction/view/transaction_view.dart b/lib/ui/transaction/view/transaction_view.dart
@@ -84,8 +84,9 @@ class _TransactionViewState extends State<TransactionView> {
                   ListDivider(),
                 ],
                 if (transaction.isConverted) ...[
-                  if (transaction.description.isNotEmpty) ...[
-                    IconMessage(transaction.description, copyToClipboard: true),
+                  if (transaction.formattedDescription.isNotEmpty) ...[
+                    IconMessage(transaction.formattedDescription,
+                        copyToClipboard: true),
                     ListDivider(),
                   ],
                   EntityListTile(

diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart