diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart index f68a35223..1dcd729e3 100644 --- a/lib/ui/invoice/edit/invoice_edit_desktop.dart +++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart @@ -235,19 +235,18 @@ class InvoiceEditDesktopState extends State .onChanged(invoice.rebuild((b) => b..date = date)); }, ), - DatePicker( - allowClearing: true, - labelText: widget.entityType == EntityType.credit - ? localization.appliedDate - : widget.entityType == EntityType.quote - ? localization.validUntil - : localization.dueDate, - selectedDate: invoice.dueDate, - onSelected: (date) { - viewModel.onChanged( - invoice.rebuild((b) => b..dueDate = date)); - }, - ), + if (widget.entityType != EntityType.credit) + DatePicker( + allowClearing: true, + labelText: widget.entityType == EntityType.quote + ? localization.validUntil + : localization.dueDate, + selectedDate: invoice.dueDate, + onSelected: (date) { + viewModel.onChanged( + invoice.rebuild((b) => b..dueDate = date)); + }, + ), DecoratedFormField( label: localization.partialDeposit, controller: _partialController, diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart index 0faeedd83..551c01796 100644 --- a/lib/ui/invoice/edit/invoice_edit_details.dart +++ b/lib/ui/invoice/edit/invoice_edit_details.dart @@ -170,17 +170,17 @@ class InvoiceEditDetailsState extends State { viewModel.onChanged(invoice.rebuild((b) => b..date = date)); }, ), - DatePicker( - labelText: widget.entityType == EntityType.credit - ? localization.appliedDate - : widget.entityType == EntityType.quote - ? localization.validUntil - : localization.dueDate, - selectedDate: invoice.dueDate, - onSelected: (date) { - viewModel.onChanged(invoice.rebuild((b) => b..dueDate = date)); - }, - ), + if (widget.entityType != EntityType.credit) + DatePicker( + labelText: widget.entityType == EntityType.quote + ? localization.validUntil + : localization.dueDate, + selectedDate: invoice.dueDate, + onSelected: (date) { + viewModel + .onChanged(invoice.rebuild((b) => b..dueDate = date)); + }, + ), DecoratedFormField( label: localization.partialDeposit, controller: _partialController, diff --git a/lib/ui/invoice/view/invoice_view_overview.dart b/lib/ui/invoice/view/invoice_view_overview.dart index 974f5a2b2..f3e2e3fb5 100644 --- a/lib/ui/invoice/view/invoice_view_overview.dart +++ b/lib/ui/invoice/view/invoice_view_overview.dart @@ -53,9 +53,7 @@ class InvoiceOverview extends StatelessWidget { ]; String dueDateField = InvoiceFields.dueDate; - if (invoice.subEntityType == EntityType.credit) { - dueDateField = CreditFields.appliedDate; - } else if (invoice.subEntityType == EntityType.quote) { + if (invoice.subEntityType == EntityType.quote) { dueDateField = QuoteFields.validUntil; } diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 83810e3e1..aac6ba766 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -34,7 +34,6 @@ mixin LocalizationsProvider on LocaleCodeAware { 'recurring_tasks': 'Recurring Tasks', 'recurring_expenses': 'Recurring Expenses', 'account_management': 'Account Management', - 'applied_date': 'Applied Date', 'credit_date': 'Credit Date', 'credit': 'Credit', 'credits': 'Credits', @@ -32823,8 +32822,6 @@ mixin LocalizationsProvider on LocaleCodeAware { String get creditDate => _localizedValues[localeCode]['credit_date']; - String get appliedDate => _localizedValues[localeCode]['applied_date']; - String get accountManagement => _localizedValues[localeCode]['account_management'];