diff --git a/custom_receipts_for_pos/__manifest__.py b/custom_receipts_for_pos/__manifest__.py
index d3153688e..fc4ec1217 100644
--- a/custom_receipts_for_pos/__manifest__.py
+++ b/custom_receipts_for_pos/__manifest__.py
@@ -22,7 +22,7 @@
 ################################################################################
 {
     'name': 'POS Receipt Design',
-    'version': '18.0.1.0.0',
+    'version': '18.0.1.0.1',
     'category': 'Point of Sale',
     'summary': "POS Receipt, Receipt Design, POS Receipt Template, Design "
                "Report, Custom Receipt, POS Report, Customise Receipt, Odoo18, "
diff --git a/custom_receipts_for_pos/doc/RELEASE_NOTES.md b/custom_receipts_for_pos/doc/RELEASE_NOTES.md
index 7f75ad886..a180376d7 100644
--- a/custom_receipts_for_pos/doc/RELEASE_NOTES.md
+++ b/custom_receipts_for_pos/doc/RELEASE_NOTES.md
@@ -4,3 +4,8 @@
 #### Version 18.0.1.0.0
 ##### ADD
 - Initial Commit for POS Receipt Design
+
+#### 04.12.2024
+#### Version 18.0.1.0.1
+##### BUG FIX
+- BUG FIX
diff --git a/custom_receipts_for_pos/static/src/xml/order_receipt.xml b/custom_receipts_for_pos/static/src/xml/order_receipt.xml
index 61606e743..56a35ec82 100644
--- a/custom_receipts_for_pos/static/src/xml/order_receipt.xml
+++ b/custom_receipts_for_pos/static/src/xml/order_receipt.xml
@@ -6,157 +6,163 @@
             <div class="pos-receipt">
                 <t t-if="isTrue">
                     <ReceiptHeader data="props.data.headerData"/>
-                        <OrderWidget lines="props.data.orderlines" t-slot-scope="scope">
+                    <OrderWidget t-if="props.data.orderlines?.length"
+                                 lines="props.data.orderlines"
+                                 t-slot-scope="scope"
+                                 generalNote="props.data.generalNote or ''"
+                                 screenName="props.data.screenName">
                         <t t-set="line" t-value="scope.line"/>
-                            <Orderline line="omit(scope.line, 'customerNote')"
-                                       class="{ 'pe-none': true }">
-                                <li t-if="line.customerNote"
-                                    class="customer-note w-100 p-2 my-1 rounded text-break">
-                                    <i class="fa fa-sticky-note me-1" role="img"
-                                       aria-label="Customer Note" title="Customer Note"/>
-                                    <t t-esc="line.customerNote"/>
-                                </li>
-                                <ul t-if="line.pack_lot_lines">
-                                <li t-foreach="line.pack_lot_lines" t-as="lot"
-                                    t-key="lot.cid">
-                                    <t t-if="lot.order_line.product.tracking == 'lot'">
-                                        Lot Number <t t-esc="lot.lot_name"/>
-                                    </t>
-                                    <t t-else="">
-                                        SN <t t-esc="lot.lot_name"/>
-                                    </t>
-                                </li>
-                            </ul>
+                        <Orderline basic_receipt="props.basic_receipt"
+                                   line="omit(scope.line, 'customerNote')"
+                                   class="{ 'px-0': true }"
+                                   showTaxGroupLabels="showTaxGroupLabels">
+                            <li t-if="line.customerNote"
+                                class="customer-note w-100 p-2 my-1 rounded text-break">
+                                <i class="fa fa-sticky-note me-1" role="img"
+                                   aria-label="Customer Note"
+                                   title="Customer Note"/>
+                                <t t-esc="line.customerNote"/>
+                            </li>
                         </Orderline>
                     </OrderWidget>
+                    <t t-if="!props.basic_receipt">
+                        <t t-set="taxTotals" t-value="props.data.taxTotals"/>
+                        <div t-if="taxTotals and taxTotals.has_tax_groups"
+                             class="pos-receipt-taxes">
+                            <div class="text-center">--------------------------------</div>
+                            <t t-foreach="taxTotals.subtotals" t-as="subtotal"
+                               t-key="subtotal.name">
+                                <div class="d-flex">
+                                    <span t-if="showTaxGroupLabels" class="me-2"
+                                          style="visibility: hidden;">A</span>
+                                    <span class="fw-bolder"
+                                          t-out="subtotal.name"/>
+                                    <span t-esc="props.formatCurrency(subtotal.base_amount_currency)"
+                                          class="ms-auto"/>
+                                </div>
 
-                    <!-- Total -->
-                    <div class="pos-receipt-right-align">--------</div>
-                    <br/>
-                    <div class="pos-receipt-amount">
-                        TOTAL
-                        <span t-esc="props.formatCurrency(props.data.amount_total)"
-                              class="pos-receipt-right-align"/>
-                    </div>
-                    <t t-if="props.data.rounding_applied">
-                        <div class="pos-receipt-amount">
-                          Rounding
-                            <span t-esc='props.formatCurrency(props.data.rounding_applied)'
-                                  class="pos-receipt-right-align"/>
-                        </div>
-                        <div class="pos-receipt-amount">To Pay
-                            <span t-esc='props.formatCurrency(props.data.amount_total + props.data.rounding_applied)'
-                               class="pos-receipt-right-align"/>
+                                <div t-foreach="subtotal.tax_groups"
+                                     t-as="tax_group" t-key="tax_group.id"
+                                     class="d-flex">
+                                    <t t-if="showTaxGroupLabels">
+                                        <span t-if="tax_group.group_label"
+                                              t-out="tax_group.group_label"
+                                              class="me-2"/>
+                                        <span t-else="" class="me-2"
+                                              style="visibility: hidden;">A</span>
+                                    </t>
+                                    <span>
+                                        <span t-esc="tax_group.group_name"/>
+                                        <t t-if="!taxTotals.same_tax_base">
+                                            on
+                                            <span t-esc="props.formatCurrency(tax_group.base_amount_currency)"/>
+                                        </t>
+                                    </span>
+                                    <span t-esc="props.formatCurrency(tax_group.tax_amount_currency)"
+                                          class="ms-auto"/>
+                                </div>
+                            </t>
                         </div>
-                    </t>
-                    <br/>
-                    <br/>
 
-                    <!-- Payment Lines -->
-
-                    <div class="paymentlines" t-foreach="props.data.paymentlines"
-                         t-as="line" t-key="line_index">
-                        <t t-esc="line.name"/>
-                            <span t-esc="props.formatCurrency(line.amount, false)"
+                        <div class="text-center">--------------------------------</div>
+                        <div class="pos-receipt-amount receipt-total">
+                            <t t-out="props.data.label_total"/>
+                            <span t-esc="props.formatCurrency(taxTotals.order_total)"
                                   class="pos-receipt-right-align"/>
-                    </div>
-                    <div class="pos-receipt-amount receipt-change mt-2">
-                        CHANGE
-                        <span t-esc="props.formatCurrency(props.data.change)"
-                              class="pos-receipt-right-align"/>
-                    </div>
-
-                    <!-- Extra Payment Info -->
+                        </div>
+                        <t t-if="'order_rounding' in taxTotals">
+                            <div class="pos-receipt-amount receipt-rounding">
+                                <t t-out="props.data.label_rounding"/>
+                                <span t-esc="props.formatCurrency(taxTotals.order_rounding)"
+                                      class="pos-receipt-right-align"/>
+                            </div>
+                            <div class="pos-receipt-amount receipt-to-pay">
+                                To Pay
+                                <span t-esc="props.formatCurrency(taxTotals.order_to_pay)"
+                                      class="pos-receipt-right-align"/>
+                            </div>
+                        </t>
+                        <!-- Payment Lines -->
+                        <div class="paymentlines text-start"
+                             t-foreach="props.data.paymentlines" t-as="line"
+                             t-key="line_index">
+                            <t t-esc="line.name"/>
+                            <span t-esc="props.formatCurrency(line.amount)"
+                                  class="pos-receipt-right-align"/>
+                        </div>
 
-                    <t t-if="props.data.total_discount">
-                        <div>
-                            Discounts
-                            <span t-esc="props.formatCurrency(props.data.total_discount)"
+                        <div t-if="'order_change' in taxTotals"
+                             class="pos-receipt-amount receipt-change">
+                            <t t-out="props.data.label_change"/>
+                            <span t-esc="props.formatCurrency(taxTotals.order_change)"
                                   class="pos-receipt-right-align"/>
                         </div>
-                    </t>
-                    <div t-if="props.data.tax_details.length > 0"
-                             class="pos-receipt-taxes">
-                        <span/>
-                            <span>TAX%</span>
-                            <span>Tax</span>
-                            <span>Base</span>
-                            <span>Total</span>
-                        <t t-foreach="props.data.tax_details" t-as="tax"
-                               t-key="tax.tax.id">
-                            <span t-esc="tax.tax.letter || ''"/>
-                                <span><t t-esc="tax.tax.amount"/>
-                                    %</span>
-                                <span t-esc="props.formatCurrency(tax.amount, false)"/>
-                                <span t-esc="props.formatCurrency(tax.base, false)"/>
-                                <span t-esc="props.formatCurrency(tax.amount + tax.base, false)"/>
+                        <!-- Extra Payment Info -->
+                        <t t-if="props.data.total_discount">
+                            <div class="text-center">
+                                <t t-out="props.data.label_discounts"/>
+                                <span t-esc="props.formatCurrency(props.data.total_discount)"
+                                      class="pos-receipt-right-align"/>
+                            </div>
                         </t>
-                        <t t-if="props.data.tax_details.length > 1">
-                            <span/>
-                                <span/>
-                                <span t-esc="props.formatCurrency(props.data.amount_tax, false)"/>
-                                <span t-esc="props.formatCurrency(props.data.total_without_tax, false)"/>
-                                <span t-esc="props.formatCurrency(props.data.amount_total, false)"/>
-                        </t>
-                    </div>
-
-                    <div class="before-footer"/>
-
-                    <div t-if="props.data.pos_qr_code">
-                        <br/>
-                        <br/>
-                        <div class="pos-receipt-order-data mb-2">
-                            Scan me to request an invoice for your purchase.
+                        <div class="before-footer"/>
+                        <div t-if="props.data.pos_qr_code">
+                            <br/>
+                            <div class="pos-receipt-order-data mb-2">
+                                Need an invoice for your purchase ?
+                            </div>
                         </div>
-                        <img id="posqrcode" t-att-src="props.data.pos_qr_code"
-                             class="pos-receipt-logo"/>
-                    </div>
-                    <div t-if="props.data.ticket_code">
-                        <br/>
-                        <br/>
-                        <div class="pos-receipt-order-data">
-                            You can go to <t t-out="props.data.base_url"/>/pos/ticket
-                            and use the code below to request an invoice online
+                        <div t-if="['qr_code', 'qr_code_and_url'].includes(props.data.headerData.company.point_of_sale_ticket_portal_url_display_mode) and props.data.pos_qr_code"
+                             class="mb-2">
+                            <img id="posqrcode"
+                                 t-att-src="props.data.pos_qr_code"
+                                 class="pos-receipt-logo"/>
                         </div>
-                        <div class="pos-receipt-order-data">
-                            Unique Code: <t t-out="props.data.ticket_code"/>
+                        <div t-if="props.data.pos_qr_code">
+                            <div class="pos-receipt-order-data">
+                                Unique Code: <t t-esc="props.data.ticket_code"/>
+                            </div>
                         </div>
-                    </div>
-
+                        <div t-if="['url', 'qr_code_and_url'].includes(props.data.headerData.company.point_of_sale_ticket_portal_url_display_mode) and props.data.pos_qr_code">
+                            <div class="pos-receipt-order-data"
+                                 t-attf-class="{{ props.data.ticket_portal_url_display_mode === 'qr_code_and_url' ? 'mt-3' : '' }}">
+                                Portal URL: <t t-out="props.data.base_url"/>
+                                /pos/ticket
+                            </div>
+                        </div>
+                    </t>
                     <!-- Footer -->
-                    <div t-if="props.data.footer" class="pos-receipt-center-align"
+                    <div t-if="props.data.footer"
+                         class="pos-receipt-center-align"
                          style="white-space:pre-line">
-                         <br/>
-                         <t t-esc="props.data.footer"/>
-                         <br/>
-                         <br/>
+                       <br/>
+                        <t t-esc="props.data.footer"/>
+                        <br/>
+                        <br/>
                     </div>
-
                     <div class="after-footer">
-                       <t t-foreach="props.data.paymentlines" t-as="line"
-                          t-key="line_index">
-                           <t t-if="line.ticket">
-                               <br/>
-                               <div class="pos-payment-terminal-receipt">
-                                   <pre t-esc="line.ticket"/>
-                               </div>
-                           </t>
-                       </t>
+                        <t t-foreach="props.data.paymentlines" t-as="line"
+                           t-key="line_index">
+                            <t t-if="line.ticket">
+                                <br/>
+                                <div class="pos-payment-terminal-receipt">
+                                    <pre t-esc="line.ticket"/>
+                                </div>
+                            </t>
+                        </t>
                     </div>
-
                     <br/>
-                    <t t-if="props.shippingDate">
+                    <t t-if="props.data.shippingDate">
                         <div class="pos-receipt-order-data">
                             Expected delivery:
-                            <div><t t-esc="props.shippingDate" /></div>
+                            <div><t t-esc="props.data.shippingDate" /></div>
                         </div>
                     </t>
-
                     <br/>
                     <div class="pos-receipt-order-data">
-                        <p>Odoo Point of Sale</p>
-                            <div t-esc="props.data.name"/>
-                            <div t-esc="props.data.date"/>
+                        <p>Powered by Odoo</p>
+                        <div t-esc="props.data.name"/>
+                        <div id="order-date" t-esc="props.data.date"/>
                     </div>
                 </t>
                 <t t-else="">