Merge branch 'master' into lineitems

This commit is contained in:
2026-03-05 07:08:30 -05:00
16 changed files with 259 additions and 219 deletions

View File

@@ -21,8 +21,6 @@ module RedmineQbo
f = context[:form]
issue = context[:issue]
project = context[:project]
log issue.inspect
log project.inspect
# Customer Name Text Box with database backed autocomplete
# onchange event will update the hidden customer_id field

View File

@@ -20,7 +20,7 @@ module RedmineQbo
#Employee.update_all
# Check to see if there is a quickbooks user attached to the issue
@selected = context[:user].employee.id if context[:user].employee
@selected = context[:user]&.employee&.id
# Generate the drop down list of quickbooks contacts
return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), selected: @selected, include_blank: true}</p>"

View File

@@ -260,8 +260,9 @@ module RedmineQbo
# Check to see if there is an estimate attached, then combine them
if issue.estimate
e_pdf, ref = EstimatePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: [issue.estimate.id])
pdf = CombinePDF.parse(pdf.output, allow_optional_content: true)
pdf << CombinePDF.parse(issue.estimate.pdf)
pdf << CombinePDF.parse(e_pdf)
return pdf.to_pdf
end