Merge branch 'develop'

This commit is contained in:
Hillel Coren 2024-01-16 15:33:58 +02:00
commit 54777d31bd
7 changed files with 2633 additions and 9 deletions

View File

@ -820,6 +820,7 @@ const List<String> kLanguages = [
'hr', 'hr',
'it', 'it',
'ja', 'ja',
'lo_LA',
'lt', 'lt',
'lv_LV', 'lv_LV',
'mk_MK', 'mk_MK',

View File

@ -145,10 +145,11 @@ class ImportType extends EnumClass {
case ImportType.csv: case ImportType.csv:
return { return {
EntityType.client.apiValue: 'clients', EntityType.client.apiValue: 'clients',
EntityType.product.apiValue: 'products',
EntityType.invoice.apiValue: 'invoices', EntityType.invoice.apiValue: 'invoices',
EntityType.recurringInvoice.apiValue: 'recurring_invoices', EntityType.recurringInvoice.apiValue: 'recurring_invoices',
EntityType.payment.apiValue: 'payments', EntityType.payment.apiValue: 'payments',
EntityType.product.apiValue: 'products', EntityType.task.apiValue: 'tasks',
EntityType.vendor.apiValue: 'vendors', EntityType.vendor.apiValue: 'vendors',
EntityType.expense.apiValue: 'expenses', EntityType.expense.apiValue: 'expenses',
EntityType.transaction.apiValue: 'transactions', EntityType.transaction.apiValue: 'transactions',

View File

@ -192,6 +192,8 @@ abstract class TransactionEntity extends Object
bool get isConverted => statusId == kTransactionStatusConverted; bool get isConverted => statusId == kTransactionStatusConverted;
String get formattedDescription => description.replaceAll('\n', ' ');
@override @override
List<EntityAction?> getActions( List<EntityAction?> getActions(
{UserCompanyEntity? userCompany, {UserCompanyEntity? userCompany,

View File

@ -140,7 +140,7 @@ ReportResult transactionReport(
value = transaction.date; value = transaction.date;
break; break;
case TransactionReportFields.description: case TransactionReportFields.description:
value = transaction.description; value = transaction.formattedDescription;
break; break;
case TransactionReportFields.vendor: case TransactionReportFields.vendor:
value = vendorMap[transaction.vendorId]?.name ?? ''; value = vendorMap[transaction.vendorId]?.name ?? '';

View File

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

View File

@ -84,8 +84,9 @@ class _TransactionViewState extends State<TransactionView> {
ListDivider(), ListDivider(),
], ],
if (transaction.isConverted) ...[ if (transaction.isConverted) ...[
if (transaction.description.isNotEmpty) ...[ if (transaction.formattedDescription.isNotEmpty) ...[
IconMessage(transaction.description, copyToClipboard: true), IconMessage(transaction.formattedDescription,
copyToClipboard: true),
ListDivider(), ListDivider(),
], ],
EntityListTile( EntityListTile(

File diff suppressed because it is too large Load Diff