Release 2.0.6 (#3900)

* cleanup invoice templates
* cleanup invoice translations
* fix invoice datetime for now
* support invoice archive order by number and status
* bump version
* allow meta-field sub-classing
* removed unused translation task.delete
* prevent null in str_replace
This commit is contained in:
Kevin Papst
2023-03-08 00:38:10 +01:00
committed by GitHub
parent 80f8f70695
commit 9d503300f6
46 changed files with 422 additions and 534 deletions

View File

@@ -204,7 +204,7 @@ class InvoiceRepository extends EntityRepository
case 'date':
$orderBy = 'i.createdAt';
break;
case 'number':
case 'invoice.number':
$orderBy = 'i.invoiceNumber';
break;
case 'payed':
@@ -213,9 +213,11 @@ class InvoiceRepository extends EntityRepository
case 'total_rate':
$orderBy = 'i.total';
break;
case 'tax':
case 'status':
$orderBy = 'i.' . $orderBy;
$orderBy = 'i.status';
break;
case 'tax':
$orderBy = 'i.tax';
break;
}

View File

@@ -21,9 +21,9 @@ class InvoiceArchiveQuery extends BaseQuery
use DateRangeTrait;
public const INVOICE_ARCHIVE_ORDER_ALLOWED = [
'date', 'total_rate',
'date', 'invoice.number', 'status', 'total_rate'
// TODO other fields have a problem with translation
// 'number', 'tax', 'payed', 'status'
// , 'tax', 'payed'
];
/**