diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart index a95422af9..5d1b1cb3a 100644 --- a/lib/data/models/company_model.dart +++ b/lib/data/models/company_model.dart @@ -546,6 +546,9 @@ abstract class CompanyEntity extends Object @override String get listDisplayName => settings?.name ?? ''; + @override + EntityType get entityType => EntityType.company; + bool hasCustomField(String field) => getCustomFieldLabel(field).isNotEmpty; bool get enableFirstInvoiceTaxRate => (numberOfInvoiceTaxRates ?? 0) >= 1; diff --git a/lib/ui/app/link_text.dart b/lib/ui/app/link_text.dart index f1ddf5048..c39c72de3 100644 --- a/lib/ui/app/link_text.dart +++ b/lib/ui/app/link_text.dart @@ -46,11 +46,15 @@ class _LinkTextRelatedEntityState extends State { ), ), onTap: () { - if (widget.entity.entityType.hasFullWidthViewer) { - viewEntity(entity: widget.entity); + final entity = widget.entity; + if (entity.entityType == EntityType.company || + entity.entityType == null) { + viewEntitiesByType(entityType: EntityType.settings); + } else if (entity.entityType.hasFullWidthViewer) { + viewEntity(entity: entity); } else { viewEntity(entity: widget.relation); - viewEntity(entity: widget.entity, addToStack: true); + viewEntity(entity: entity, addToStack: true); } }, onLongPress: () { diff --git a/lib/ui/document/document_presenter.dart b/lib/ui/document/document_presenter.dart index 00e3d45b8..9f6aa27f3 100644 --- a/lib/ui/document/document_presenter.dart +++ b/lib/ui/document/document_presenter.dart @@ -56,8 +56,6 @@ class DocumentPresenter extends EntityPresenter { case DocumentFields.linkedTo: final parentEntity = state.getEntity(document.parentType, document.parentId); - print( - '## ${document.parentType} ${document.parentId} => $parentEntity'); return LinkTextRelatedEntity(entity: parentEntity, relation: document); }