Merge branch 'dev' into 5148-logs-style
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
ee10146e0f
|
@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
### Fixed
|
||||
- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
|
||||
|
||||
- (Tickets -> Añadir pago) Eliminado "null" en las referencias
|
||||
|
||||
## [2302.01] - 2023-01-26
|
||||
|
||||
|
|
|
@ -59,13 +59,11 @@ class Controller extends Dialog {
|
|||
|
||||
if (value) {
|
||||
const accountingType = value.accountingType;
|
||||
if (this.originalDescription) {
|
||||
this.receipt.description =
|
||||
`${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
|
||||
} else {
|
||||
this.receipt.description =
|
||||
`${accountingType && accountingType.receiptDescription}`;
|
||||
}
|
||||
if (accountingType.receiptDescription != null) {
|
||||
this.receipt.description = accountingType.receiptDescription;
|
||||
if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`;
|
||||
} else if (this.originalDescription)
|
||||
this.receipt.description = this.originalDescription;
|
||||
this.maxAmount = accountingType && accountingType.maxAmount;
|
||||
|
||||
this.receipt.payed = new Date();
|
||||
|
|
Loading…
Reference in New Issue