Skip to content

v0.53.0 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
W1W1-M merged 1 commit into from
Jun 29, 2026
Merged

v0.53.0 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org) using the following scheme: MAJOR.MINOR.PATCH

## [0.53.0] - 2026-06-29

### Changed
- Updated Dolibarr expense report line to conform to CommonBusinessObjectLine protocol

## [0.52.0] - 2026-06-23

### Changed
Expand Down
67 changes: 45 additions & 22 deletions Sources/SwiftDolibarr/Models/Core/ExpenseReport/DolibarrExpenseReportLine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,15 @@ import OSLog
/// Each line represents an individual expense with a fee type, quantity,
/// unit price, tax rate, and totals.
///
/// - Note: Requires the **Deplacement** module to be activated in Dolibarr.
/// - Note: Requires the **Expensereport** module to be activated in Dolibarr.
/// - SeeAlso: ``DolibarrExpenseReport``
#if os(iOS) || os(macOS) || os(watchOS) || os(tvOS) || os(visionOS)
@Observable
#endif
public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
public final class DolibarrExpenseReportLine: CommonBusinessObjectLine {

// MARK: - Properties

/// Expense report line ID
public var id: String

/// Expense report line quantity
///
/// - Mapped Dolibarr property: **qty**
Expand Down Expand Up @@ -97,7 +94,6 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
// MARK: - Enums

enum CodingKeys: String, CodingKey {
case id
case quantity = "qty"
case unitPriceInclTax = "value_unit"
case date = "dates"
Expand All @@ -114,7 +110,6 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
// MARK: - Inits

public init(
id: String,
quantity: String,
unitPriceInclTax: String,
date: Int,
Expand All @@ -125,9 +120,10 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
totalTax: String,
totalInclTax: String,
taxRate: String,
comments: String? = nil
comments: String? = nil,
id: String = "",
rang: String = ""
) {
self.id = id
self.quantity = quantity
self.unitPriceInclTax = unitPriceInclTax
self.date = date
Expand All @@ -139,15 +135,15 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
self.totalInclTax = totalInclTax
self.taxRate = taxRate
self.comments = comments
super.init(id: id, rang: rang)
}

public init(from decoder: any Decoder) throws {
required public init(from decoder: any Decoder) throws {
do {
#if os(iOS) || os(macOS) || os(watchOS) || os(tvOS) || os(visionOS)
Logger.logWithoutSignal("\(Self.self).init.decode", level: .info, category: .api)
#endif
let container = try decoder.container(keyedBy: CodingKeys.self)
self.id = try container.decode(String.self, forKey: .id)
self.quantity = try container.decode(String.self, forKey: .quantity)
self.unitPriceInclTax = try container.decode(String.self, forKey: .unitPriceInclTax)
self.date = try container.decode(Int.self, forKey: .date)
Expand All @@ -159,6 +155,7 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
self.totalInclTax = try container.decode(String.self, forKey: .totalInclTax)
self.taxRate = try container.decode(String.self, forKey: .taxRate)
self.comments = try container.decodeIfPresent(String.self, forKey: .comments)
try super.init(from: decoder)
#if os(iOS) || os(macOS) || os(watchOS) || os(tvOS) || os(visionOS)
Logger.logWithoutSignal("\(Self.self).init.decoded", level: .info, category: .api)
#endif
Expand All @@ -174,11 +171,42 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
throw error
}
}

public init(copying source: DolibarrExpenseReportLine) {
self.quantity = source.quantity
self.unitPriceInclTax = source.unitPriceInclTax
self.date = source.date
self.feeTypeId = source.feeTypeId
self.feeTypeCode = source.feeTypeCode
self.feeTypeLabel = source.feeTypeLabel
self.totalExclTax = source.totalExclTax
self.totalTax = source.totalTax
self.totalInclTax = source.totalInclTax
self.taxRate = source.taxRate
self.comments = source.comments
super.init(copying: source)
}

// MARK: - Methods

public func copy(_ source: DolibarrExpenseReportLine) {
self.quantity = source.quantity
self.unitPriceInclTax = source.unitPriceInclTax
self.date = source.date
self.feeTypeId = source.feeTypeId
self.feeTypeCode = source.feeTypeCode
self.feeTypeLabel = source.feeTypeLabel
self.totalExclTax = source.totalExclTax
self.totalTax = source.totalTax
self.totalInclTax = source.totalInclTax
self.taxRate = source.taxRate
self.comments = source.comments
super.copy(source)
}

// MARK: - Protocol methods

public func hash(into hasher: inout Hasher) {
hasher.combine(id)
override public func hash(into hasher: inout Hasher) {
hasher.combine(quantity)
hasher.combine(unitPriceInclTax)
hasher.combine(date)
Expand All @@ -189,14 +217,12 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
hasher.combine(totalTax)
hasher.combine(totalInclTax)
hasher.combine(taxRate)
if let comments {
hasher.combine(comments)
}
hasher.combine(optional: comments)
super.hash(into: &hasher)
}

public func encode(to encoder: any Encoder) throws {
override public func encode(to encoder: any Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(id, forKey: .id)
try container.encode(quantity, forKey: .quantity)
try container.encode(unitPriceInclTax, forKey: .unitPriceInclTax)
try container.encode(date, forKey: .date)
Expand All @@ -208,10 +234,7 @@ public final class DolibarrExpenseReportLine: Identifiable, Hashable, Codable {
try container.encode(totalInclTax, forKey: .totalInclTax)
try container.encode(taxRate, forKey: .taxRate)
try container.encodeIfPresent(comments, forKey: .comments)
}

public static func == (lhs: DolibarrExpenseReportLine, rhs: DolibarrExpenseReportLine) -> Bool {
lhs.id == rhs.id
try super.encode(to: encoder)
}

}
Loading