From 9c1c9e3838cd3d266cf5630748e457d7dda50a41 Mon Sep 17 00:00:00 2001 From: Jeremy Aalders Date: Mon, 27 May 2024 10:52:00 -0300 Subject: [PATCH] LSR-28559 - Update PR as per feedback. --- receipt/SaleReceipt.tpl | 24 ++++++++++++------------ receipt/SaleReceipt_fr_CA-QC.tpl | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/receipt/SaleReceipt.tpl b/receipt/SaleReceipt.tpl index ea21332..780284a 100644 --- a/receipt/SaleReceipt.tpl +++ b/receipt/SaleReceipt.tpl @@ -987,19 +987,19 @@ table.payments td.label { {% endif %} {% endif %} - - {% if options.per_line_subtotal and options.discounted_line_items and Line.calcLineDiscount != 0 and not parameters.gift_receipt %} - {{Line.unitQuantity}} x {{Line.unitPrice|money}} - {% endif %} - {{Line.unitQuantity}} - {% if options.per_line_subtotal and not parameters.gift_receipt %} x - {% if options.discounted_line_items %} - {{ divide(Line.displayableSubtotal, Line.unitQuantity)|money }} - {% else %} - {{Line.displayableUnitPrice|money}} - {% endif %} + + {% if options.per_line_subtotal and options.discounted_line_items and Line.calcLineDiscount != 0 and not parameters.gift_receipt %} + {{Line.unitQuantity}} x {{Line.unitPrice|money}} + {% endif %} + {{Line.unitQuantity}} + {% if options.per_line_subtotal and not parameters.gift_receipt %} x + {% if options.discounted_line_items %} + {{ divide(Line.displayableSubtotal, Line.unitQuantity)|money }} + {% else %} + {{Line.displayableUnitPrice|money}} {% endif %} - + {% endif %} + {% if not parameters.gift_receipt %} diff --git a/receipt/SaleReceipt_fr_CA-QC.tpl b/receipt/SaleReceipt_fr_CA-QC.tpl index 89629bb..189281f 100644 --- a/receipt/SaleReceipt_fr_CA-QC.tpl +++ b/receipt/SaleReceipt_fr_CA-QC.tpl @@ -231,6 +231,10 @@ table div.line_description_item_fee { padding-left: 10px; } +.footerSectionTitle + table div.line_description_item_fee { + padding-left: 25px; +} + table.workorders div.line_description { font-weight: normal; padding-left: 10px;