Merge branch 'develop'
This commit is contained in:
commit
54777d31bd
|
|
@ -820,6 +820,7 @@ const List<String> kLanguages = [
|
|||
'hr',
|
||||
'it',
|
||||
'ja',
|
||||
'lo_LA',
|
||||
'lt',
|
||||
'lv_LV',
|
||||
'mk_MK',
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 ?? '';
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
2624
lib/utils/i18n.dart
2624
lib/utils/i18n.dart
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue