mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-11-18 02:20:37 -05:00
Combine the labor settings into Labor products/services
The estimate item codes and "Replaced by imported time" become one list of products/services (RedmineQboBilling::LaborItems), used to create issues from an estimate's labor lines (and an appointment's minimum hours), to offer an invoice's labor lines to be replaced by imported time, and to total the hours on estimates and invoices for the business report. While none are chosen, products/services named Labor are used. The old settings and redmine_qbo_calendar's fallbacks are no longer read. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BiwYMjhoQvL7XsKKfRz4pM
This commit is contained in:
12 files changed
+120
-83
No files matched your search
@@ -10,17 +10,16 @@
|
||||
|
||||
|
||||
module RedmineQboBilling
|
||||
# The man-hours on a QuickBooks estimate or invoice: the quantities of its lines whose product/service is set
|
||||
# as "Replaced by imported time" (e.g. Labor), including lines inside bundles. While that setting is blank,
|
||||
# lines matching the estimate item codes are counted instead (counting every line would include parts).
|
||||
# The man-hours on a QuickBooks estimate or invoice: the quantities of its labor lines (the plugin setting
|
||||
# "Labor products/services", see LaborItems), including lines inside bundles.
|
||||
module ManHours
|
||||
module_function
|
||||
|
||||
def hours(document, item_ids: InvoiceWriter.replaceable_item_ids, codes: nil)
|
||||
def hours(document, item_ids: LaborItems.ids, codes: nil)
|
||||
return 0.0 if document.nil?
|
||||
|
||||
ids = Array(item_ids).map(&:to_s).reject(&:blank?)
|
||||
codes ||= EstimateIssueBuilder.item_codes if ids.empty?
|
||||
codes ||= LaborItems.codes if ids.empty?
|
||||
sum_lines(document.line_items, ids, codes).round(2)
|
||||
end
|
||||
|
||||
@@ -30,7 +29,7 @@ module RedmineQboBilling
|
||||
next sum_lines(group.line_items, ids, codes) if group
|
||||
|
||||
detail = sales_detail(line)
|
||||
next 0.0 unless detail&.item_ref && man_hour_item?(detail.item_ref, ids, codes)
|
||||
next 0.0 unless detail && LaborItems.match?(detail.item_ref, ids: ids, codes: codes)
|
||||
detail.quantity.to_f
|
||||
end
|
||||
end
|
||||
@@ -40,10 +39,5 @@ module RedmineQboBilling
|
||||
elsif line.respond_to?(:sales_item_line_detail) then line.sales_item_line_detail
|
||||
end
|
||||
end
|
||||
|
||||
def man_hour_item?(ref, ids, codes)
|
||||
return ids.include?(ref.value.to_s) if ids.any?
|
||||
EstimateIssueBuilder.item_matches?(ref.name, codes)
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user