diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 91cd0e95..021a3548 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ assignees: ''
 
 **IMPORTANT** Before reporting a bug:
 
-A properly detailed bug report can save a LOT of time and help fixing issues as soon as possible.
+A properly detailed bug report can save a LOT of time and help fix issues as soon as possible.
 - ->
 
 ### Versions
@@ -31,7 +31,7 @@ A properly detailed bug report can save a LOT of time and help fixing issues as
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See error
+4. See the error
 
 ### What is Expected?
 
@@ -44,4 +44,4 @@ Add any other context about the problem here.
 
 
 ### Screenshots
-If applicable, add screenshots to help explain your problem.
+If applicable, could you add screenshots to help explain your problem?
diff --git a/posawesome/__init__.py b/posawesome/__init__.py
index 7a5f57c6..21e6bdff 100644
--- a/posawesome/__init__.py
+++ b/posawesome/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = "6.0.4"
+__version__ = "6.1.0"
 
 
 def console(*data):
diff --git a/posawesome/posawesome/api/payment_entry.py b/posawesome/posawesome/api/payment_entry.py
index 6eb5e3f7..c7472615 100644
--- a/posawesome/posawesome/api/payment_entry.py
+++ b/posawesome/posawesome/api/payment_entry.py
@@ -12,6 +12,7 @@
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.doctype.bank_account.bank_account import get_party_bank_account
 from posawesome.posawesome.api.m_pesa import submit_mpesa_payment
+from erpnext.accounts.utils import QueryPaymentLedger, get_outstanding_invoices as _get_outstanding_invoices
 
 
 def create_payment_entry(
@@ -23,6 +24,7 @@ def create_payment_entry(
     reference_date=None,
     reference_no=None,
     posting_date=None,
+    cost_center=None,
     submit=0,
 ):
     # TODO : need to have a better way to handle currency
@@ -48,7 +50,7 @@ def create_payment_entry(
     pe = frappe.new_doc("Payment Entry")
     pe.payment_type = payment_type
     pe.company = company
-    pe.cost_center = erpnext.get_default_cost_center(company)
+    pe.cost_center = cost_center or erpnext.get_default_cost_center(company)
     pe.posting_date = date
     pe.mode_of_payment = mode_of_payment
     pe.party_type = party_type
@@ -127,34 +129,66 @@ def set_paid_amount_and_received_amount(
 
 @frappe.whitelist()
 def get_outstanding_invoices(company, currency, customer=None, pos_profile_name=None):
-    filters = {
-        "company": company,
-        "outstanding_amount": (">", 0),
-        "docstatus": 1,
-        "is_return": 0,
-        "currency": currency,
-    }
     if customer:
-        filters.update({"customer": customer})
-    if pos_profile_name:
-        filters.update({"pos_profile": pos_profile_name})
-    invoices = frappe.get_all(
-        "Sales Invoice",
-        filters=filters,
-        fields=[
-            "name",
-            "customer",
-            "customer_name",
-            "outstanding_amount",
-            "grand_total",
-            "due_date",
-            "posting_date",
-            "currency",
-            "pos_profile",
-        ],
-        order_by="due_date asc",
-    )
-    return invoices
+        precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
+        outstanding_invoices = _get_outstanding_invoices(
+            party_type="Customer",
+            party=customer,
+            account=get_party_account("Customer", customer, company),
+        )
+        invoices_list = []
+        customer_name = frappe.get_cached_value("Customer", customer, "customer_name")
+        for invoice in outstanding_invoices:
+            if invoice.get("currency") == currency:
+                if pos_profile_name and frappe.get_cached_value(
+                    "Sales Invoice", invoice.get("voucher_no"), "pos_profile"
+                ) != pos_profile_name:
+                    continue
+                outstanding_amount = invoice.outstanding_amount
+                if outstanding_amount > 0.5 / (10**precision):
+                    invoice_dict = {
+                        "name": invoice.get("voucher_no"),
+                        "customer": customer,
+                        "customer_name": customer_name,
+                        "outstanding_amount": invoice.get("outstanding_amount"),
+                        "grand_total": invoice.get("invoice_amount"),
+                        "due_date": invoice.get("due_date"),
+                        "posting_date": invoice.get("posting_date"),
+                        "currency": invoice.get("currency"),
+                        "pos_profile": pos_profile_name,
+
+                    }
+                    invoices_list.append(invoice_dict)
+        return invoices_list
+    else:
+        filters = {
+            "company": company,
+            "outstanding_amount": (">", 0),
+            "docstatus": 1,
+            "is_return": 0,
+            "currency": currency,
+        }
+        if customer:
+            filters.update({"customer": customer})
+        if pos_profile_name:
+            filters.update({"pos_profile": pos_profile_name})
+        invoices = frappe.get_all(
+            "Sales Invoice",
+            filters=filters,
+            fields=[
+                "name",
+                "customer",
+                "customer_name",
+                "outstanding_amount",
+                "grand_total",
+                "due_date",
+                "posting_date",
+                "currency",
+                "pos_profile",
+            ],
+            order_by="due_date asc",
+        )
+        return invoices
 
 
 @frappe.whitelist()
@@ -258,6 +292,7 @@ def process_pos_payment(payload):
                     posting_date=today,
                     reference_no=pos_opening_shift_name,
                     reference_date=today,
+                    cost_center=data.pos_profile.get("cost_center"),
                     submit=1,
                 )
                 new_payments_entry.append(new_payment_entry)
diff --git a/posawesome/posawesome/api/posapp.py b/posawesome/posawesome/api/posapp.py
index 4aca5faf..d737a14c 100644
--- a/posawesome/posawesome/api/posapp.py
+++ b/posawesome/posawesome/api/posapp.py
@@ -30,12 +30,13 @@
     get_applicable_delivery_charges as _get_applicable_delivery_charges,
 )
 from frappe.utils.caching import redis_cache
+from posawesome.posawesome.api.taxes import calculate_taxes
 
 
 @frappe.whitelist()
 def get_opening_dialog_data():
     data = {}
-    data["companys"] = frappe.get_list("Company", limit_page_length=0, order_by="name")
+    data["companies"] = frappe.get_list("Company", limit_page_length=0, order_by="name")
     data["pos_profiles_data"] = frappe.get_list(
         "POS Profile",
         filters={"disabled": 0},
@@ -266,6 +267,7 @@ def _get_items(pos_profile, price_list, item_group, search_value):
                                             "batch_qty": batch.qty,
                                             "expiry_date": batch_doc.expiry_date,
                                             "batch_price": batch_doc.posa_batch_price,
+                                            "manufacturing_date": batch_doc.manufacturing_date,
                                         }
                                     )
                 serial_no_data = []
@@ -491,6 +493,7 @@ def update_invoice(data):
             for tax in invoice_doc.taxes:
                 tax.included_in_print_rate = 1
 
+    calculate_taxes(invoice_doc)
     invoice_doc.save()
     return invoice_doc
 
@@ -884,6 +887,7 @@ def _get_items_details(pos_profile, items_data):
                                         "batch_qty": batch.qty,
                                         "expiry_date": batch_doc.expiry_date,
                                         "batch_price": batch_doc.posa_batch_price,
+                                        "manufacturing_date": batch_doc.manufacturing_date,
                                     }
                                 )
 
@@ -913,12 +917,31 @@ def _get_items_details(pos_profile, items_data):
 @frappe.whitelist()
 def get_item_detail(item, doc=None, warehouse=None, price_list=None):
     item = json.loads(item)
+    today = nowdate()
     item_code = item.get("item_code")
-    if warehouse and item.get("has_batch_no") and not item.get("batch_no"):
-        item["batch_no"] = get_batch_no(
-            item_code, warehouse, item.get("qty"), False, item.get("d")
-        )
+    batch_no_data = []
+    if warehouse and item.get("has_batch_no"):
+        batch_list = get_batch_qty(warehouse=warehouse, item_code=item_code)
+        if batch_list:
+            for batch in batch_list:
+                if batch.qty > 0 and batch.batch_no:
+                    batch_doc = frappe.get_cached_doc("Batch", batch.batch_no)
+                    if (
+                        str(batch_doc.expiry_date) > str(today)
+                        or batch_doc.expiry_date in ["", None]
+                    ) and batch_doc.disabled == 0:
+                        batch_no_data.append(
+                            {
+                                "batch_no": batch.batch_no,
+                                "batch_qty": batch.qty,
+                                "expiry_date": batch_doc.expiry_date,
+                                "batch_price": batch_doc.posa_batch_price,
+                                "manufacturing_date": batch_doc.manufacturing_date,
+                            }
+                        )
+
     item["selling_price_list"] = price_list
+
     max_discount = frappe.get_value("Item", item_code, "max_discount")
     res = get_item_details(
         item,
@@ -928,6 +951,7 @@ def get_item_detail(item, doc=None, warehouse=None, price_list=None):
     if item.get("is_stock_item") and warehouse:
         res["actual_qty"] = get_stock_availability(item_code, warehouse)
     res["max_discount"] = max_discount
+    res["batch_no_data"] = batch_no_data
     return res
 
 
diff --git a/posawesome/posawesome/api/taxes.py b/posawesome/posawesome/api/taxes.py
new file mode 100644
index 00000000..58af9b6b
--- /dev/null
+++ b/posawesome/posawesome/api/taxes.py
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2023, Youssef Restom and contributors
+# For license information, please see license.txt
+
+
+from __future__ import unicode_literals
+
+# import frappe
+import json
+from frappe import _
+from frappe.utils import flt, cint, nowdate
+
+
+def calculate_taxes(invoice_doc):
+    invoice_doc.transaction_date = nowdate()
+    rounding_adjustment_computed = invoice_doc.get(
+        "is_consolidated"
+    ) and invoice_doc.get("rounding_adjustment")
+    if not rounding_adjustment_computed:
+        invoice_doc.rounding_adjustment = 0
+
+    # maintain actual tax rate based on idx
+    actual_tax_dict = dict(
+        [
+            [tax.idx, flt(tax.tax_amount, tax.precision("tax_amount"))]
+            for tax in invoice_doc.get("taxes")
+            if tax.charge_type == "Actual"
+        ]
+    )
+
+    for tax in invoice_doc.get("taxes"):
+        if not (invoice_doc.get("is_consolidated") or tax.get("dont_recompute_tax")):
+            tax.item_wise_tax_detail = {}
+        tax.tax_amount = 0.0
+        tax.tax_amount_after_discount_amount = 0.0
+
+    discount_amount_applied = False
+    if invoice_doc.apply_discount_on == "Grand Total" and invoice_doc.get(
+        "is_cash_or_non_trade_discount"
+    ):
+        discount_amount_applied = True
+
+    for n, item in enumerate(invoice_doc.items):
+        item.net_amount = item.amount
+        item_tax_map = _load_item_tax_rate(item.item_tax_rate)
+
+        for i, tax in enumerate(invoice_doc.get("taxes")):
+            # tax_amount represents the amount of tax for the current step
+            current_tax_amount = get_current_tax_amount(
+                invoice_doc, item, tax, item_tax_map
+            )
+
+            # Adjust divisional loss to the last item
+            if tax.charge_type == "Actual":
+                actual_tax_dict[tax.idx] -= current_tax_amount
+                if n == len(invoice_doc.items) - 1:
+                    current_tax_amount += actual_tax_dict[tax.idx]
+
+            # accumulate tax amount into tax.tax_amount
+            if tax.charge_type != "Actual" and not (
+                discount_amount_applied
+                and invoice_doc.apply_discount_on == "Grand Total"
+            ):
+                tax.tax_amount += current_tax_amount
+
+            # store tax_amount for current item as it will be used for
+            # charge type = 'On Previous Row Amount'
+            tax.tax_amount_for_current_item = current_tax_amount
+
+            # set tax after discount
+            tax.tax_amount_after_discount_amount += current_tax_amount
+
+            current_tax_amount = get_tax_amount_if_for_valuation_or_deduction(
+                invoice_doc, current_tax_amount, tax
+            )
+
+            # note: grand_total_for_current_item contains the contribution of
+            # item's amount, previously applied tax and the current tax on that item
+            if i == 0:
+                tax.grand_total_for_current_item = flt(
+                    item.net_amount + current_tax_amount
+                )
+            else:
+                tax.grand_total_for_current_item = flt(
+                    invoice_doc.get("taxes")[i - 1].grand_total_for_current_item
+                    + current_tax_amount
+                )
+
+    for tax in invoice_doc.get("taxes"):
+        tax.dont_recompute_tax = 1
+        tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail)
+
+
+def _load_item_tax_rate(item_tax_rate):
+    return json.loads(item_tax_rate) if item_tax_rate else {}
+
+
+def _get_tax_rate(invoice_doc, tax, item_tax_map):
+    if tax.account_head in item_tax_map:
+        return flt(
+            item_tax_map.get(tax.account_head), invoice_doc.precision("rate", tax)
+        )
+    else:
+        return 0.0
+
+
+def set_item_wise_tax(invoice_doc, item, tax, tax_rate, current_tax_amount):
+    # store tax breakup for each item
+    key = item.item_code or item.item_name
+    item_wise_tax_amount = current_tax_amount * invoice_doc.conversion_rate
+    if (
+        tax.item_wise_tax_detail.get(key)
+        and tax.item_wise_tax_detail.get(key)[0] == tax_rate
+    ):
+        item_wise_tax_amount += tax.item_wise_tax_detail[key][1]
+
+    elif not tax.item_wise_tax_detail.get(key):
+        tax.item_wise_tax_detail[key] = [tax_rate, flt(item_wise_tax_amount)]
+
+
+def get_current_tax_amount(invoice_doc, item, tax, item_tax_map):
+    tax_rate = _get_tax_rate(invoice_doc, tax, item_tax_map)
+    current_tax_amount = 0.0
+
+    if tax.charge_type == "Actual":
+        # distribute the tax amount proportionally to each item row
+        actual = flt(tax.tax_amount, tax.precision("tax_amount"))
+        current_tax_amount = (
+            item.net_amount * actual / invoice_doc.doc.net_total
+            if invoice_doc.net_total
+            else 0.0
+        )
+
+    elif tax.charge_type == "On Net Total":
+        current_tax_amount = (tax_rate / 100.0) * item.net_amount
+    elif tax.charge_type == "On Previous Row Amount":
+        current_tax_amount = (tax_rate / 100.0) * invoice_doc.get("taxes")[
+            cint(tax.row_id) - 1
+        ].tax_amount_for_current_item
+    elif tax.charge_type == "On Previous Row Total":
+        current_tax_amount = (tax_rate / 100.0) * invoice_doc.get("taxes")[
+            cint(tax.row_id) - 1
+        ].grand_total_for_current_item
+    elif tax.charge_type == "On Item Quantity":
+        current_tax_amount = tax_rate * item.qty
+
+    if not (invoice_doc.get("is_consolidated") or tax.get("dont_recompute_tax")):
+        set_item_wise_tax(invoice_doc, item, tax, tax_rate, current_tax_amount)
+
+    return current_tax_amount
+
+
+def get_tax_amount_if_for_valuation_or_deduction(invoice_doc, tax_amount, tax):
+    # if just for valuation, do not add the tax amount in total
+    # if tax/charges is for deduction, multiply by -1
+    if getattr(tax, "category", None):
+        tax_amount = 0.0 if (tax.category == "Valuation") else tax_amount
+        if invoice_doc.doctype in [
+            "Purchase Order",
+            "Purchase Invoice",
+            "Purchase Receipt",
+            "Supplier Quotation",
+        ]:
+            tax_amount *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0
+    return tax_amount
diff --git a/posawesome/public/js/posapp/components/payments/Pay.vue b/posawesome/public/js/posapp/components/payments/Pay.vue
index a24ab90d..c10f8b0b 100644
--- a/posawesome/public/js/posapp/components/payments/Pay.vue
+++ b/posawesome/public/js/posapp/components/payments/Pay.vue
@@ -12,9 +12,9 @@
             <v-row>
               <v-col md="7" cols="12">
                 <p>
-                  <strong>{{ __('Invoices') }}</strong>
+                  <strong>{{ __("Invoices") }}</strong>
                   <span v-if="total_outstanding_amount" class="primary--text"
-                    >{{ __('- Total Outstanding') }} :
+                    >{{ __("- Total Outstanding") }} :
                     {{ currencySymbol(pos_profile.currency) }}
                     {{ formtCurrency(total_outstanding_amount) }}</span
                   >
@@ -22,7 +22,7 @@
               </v-col>
               <v-col md="5" cols="12">
                 <p v-if="total_selected_invoices" class="golden--text text-end">
-                  <span>{{ __('Total Selected :') }}</span>
+                  <span>{{ __("Total Selected :") }}</span>
                   <span>
                     {{ currencySymbol(pos_profile.currency) }}
                     {{ formtCurrency(total_selected_invoices) }}
@@ -51,7 +51,7 @@
                   color="warning"
                   dark
                   @click="get_outstanding_invoices"
-                  >{{ __('Search') }}</v-btn
+                  >{{ __("Search") }}</v-btn
                 >
               </v-col>
             </v-row>
@@ -88,9 +88,9 @@
             <v-row>
               <v-col md="7" cols="12">
                 <p>
-                  <strong>{{ __('Payments') }}</strong>
+                  <strong>{{ __("Payments") }}</strong>
                   <span v-if="total_unallocated_amount" class="primary--text">
-                    {{ __('- Total Unallocated') }} :
+                    {{ __("- Total Unallocated") }} :
                     {{ currencySymbol(pos_profile.currency) }}
                     {{ formtCurrency(total_unallocated_amount) }}
                   </span>
@@ -98,7 +98,7 @@
               </v-col>
               <v-col md="5" cols="12">
                 <p v-if="total_selected_payments" class="golden--text text-end">
-                  <span>{{ __('Total Selected :') }}</span>
+                  <span>{{ __("Total Selected :") }}</span>
                   <span>
                     {{ currencySymbol(pos_profile.currency) }}
                     {{ formtCurrency(total_selected_payments) }}
@@ -135,13 +135,13 @@
               <v-col md="8" cols="12">
                 <p>
                   <span
-                    ><strong>{{ __('Search Mpesa Payments') }}</strong></span
+                    ><strong>{{ __("Search Mpesa Payments") }}</strong></span
                   >
                 </p>
               </v-col>
               <v-col md="4" cols="12" v-if="total_selected_mpesa_payments">
                 <p class="golden--text text-end">
-                  <span>{{ __('Total Selected :') }}</span>
+                  <span>{{ __("Total Selected :") }}</span>
                   <span>
                     {{ currencySymbol(pos_profile.currency) }}
                     {{ formtCurrency(total_selected_mpesa_payments) }}
@@ -181,7 +181,7 @@
                   color="warning"
                   dark
                   @click="get_draft_mpesa_payments_register"
-                  >{{ __('Search') }}</v-btn
+                  >{{ __("Search") }}</v-btn
                 >
               </v-col>
             </v-row>
@@ -215,7 +215,7 @@
             <h4 class="primary--text">Totals</h4>
             <v-row>
               <v-col md="7" class="mt-1">
-                <span>{{ __('Total Invoices:') }}</span>
+                <span>{{ __("Total Invoices:") }}</span>
               </v-col>
               <v-col md="5">
                 <v-text-field
@@ -235,7 +235,7 @@
 
             <v-row v-if="total_selected_payments">
               <v-col md="7" class="mt-1"
-                ><span>{{ __('Total Payments:') }}</span></v-col
+                ><span>{{ __("Total Payments:") }}</span></v-col
               >
               <v-col md="5">
                 <v-text-field
@@ -255,7 +255,7 @@
 
             <v-row v-if="total_selected_mpesa_payments">
               <v-col md="7" class="mt-1"
-                ><span>{{ __('Total Mpesa:') }}</span></v-col
+                ><span>{{ __("Total Mpesa:") }}</span></v-col
               >
               <v-col md="5">
                 <v-text-field
@@ -306,7 +306,7 @@
             <v-divider></v-divider>
             <v-row>
               <v-col md="7">
-                <h4 class="primary--text mt-1">{{ __('Difference:') }}</h4>
+                <h4 class="primary--text mt-1">{{ __("Difference:") }}</h4>
               </v-col>
               <v-col md="5">
                 <v-text-field
@@ -329,7 +329,7 @@
             style="position: absolute; bottom: 0; width: 100%"
           >
             <v-btn block color="primary" dark @click="submit">
-              {{ __('Submit') }}
+              {{ __("Submit") }}
             </v-btn>
           </div>
         </v-card>
@@ -339,21 +339,21 @@
 </template>
 
 <script>
-import { evntBus } from '../../bus';
-import format from '../../format';
-import Customer from '../pos/Customer.vue';
-import UpdateCustomer from '../pos/UpdateCustomer.vue';
+import { evntBus } from "../../bus";
+import format from "../../format";
+import Customer from "../pos/Customer.vue";
+import UpdateCustomer from "../pos/UpdateCustomer.vue";
 
 export default {
   mixins: [format],
   data: function () {
     return {
       dialog: false,
-      pos_profile: '',
-      pos_opening_shift: '',
-      customer_name: '',
-      customer_info: '',
-      company: '',
+      pos_profile: "",
+      pos_opening_shift: "",
+      customer_name: "",
+      customer_info: "",
+      company: "",
       singleSelect: false,
       invoices_loading: false,
       unallocated_payments_loading: false,
@@ -366,116 +366,116 @@ export default {
       selected_payments: [],
       selected_mpesa_payments: [],
       pos_profiles_list: [],
-      pos_profile_search: '',
+      pos_profile_search: "",
       payment_methods_list: [],
-      mpesa_searchname: '',
-      mpesa_search_mobile: '',
+      mpesa_searchname: "",
+      mpesa_search_mobile: "",
       invoices_headers: [
         {
-          text: __('Invoice'),
-          align: 'start',
+          text: __("Invoice"),
+          align: "start",
           sortable: true,
-          value: 'name',
+          value: "name",
         },
         {
-          text: __('Customer'),
-          align: 'start',
+          text: __("Customer"),
+          align: "start",
           sortable: true,
-          value: 'customer_name',
+          value: "customer_name",
         },
         {
-          text: __('Date'),
-          align: 'start',
+          text: __("Date"),
+          align: "start",
           sortable: true,
-          value: 'posting_date',
+          value: "posting_date",
         },
         {
-          text: __('Due Date'),
-          align: 'start',
+          text: __("Due Date"),
+          align: "start",
           sortable: true,
-          value: 'due_date',
+          value: "due_date",
         },
         {
-          text: __('Total'),
-          align: 'end',
+          text: __("Total"),
+          align: "end",
           sortable: true,
-          value: 'grand_total',
+          value: "grand_total",
         },
         {
-          text: __('Outstanding'),
-          align: 'end',
+          text: __("Outstanding"),
+          align: "end",
           sortable: true,
-          value: 'outstanding_amount',
+          value: "outstanding_amount",
         },
       ],
       unallocated_payments_headers: [
         {
-          text: __('Payment ID'),
-          align: 'start',
+          text: __("Payment ID"),
+          align: "start",
           sortable: true,
-          value: 'name',
+          value: "name",
         },
         {
-          text: __('Customer'),
-          align: 'start',
+          text: __("Customer"),
+          align: "start",
           sortable: true,
-          value: 'customer_name',
+          value: "customer_name",
         },
         {
-          text: __('Date'),
-          align: 'start',
+          text: __("Date"),
+          align: "start",
           sortable: true,
-          value: 'posting_date',
+          value: "posting_date",
         },
         {
-          text: __('Mode'),
-          align: 'start',
+          text: __("Mode"),
+          align: "start",
           sortable: true,
-          value: 'mode_of_payment',
+          value: "mode_of_payment",
         },
         {
-          text: __('Paid'),
-          align: 'end',
+          text: __("Paid"),
+          align: "end",
           sortable: true,
-          value: 'paid_amount',
+          value: "paid_amount",
         },
         {
-          text: __('Unallocated'),
-          align: 'end',
+          text: __("Unallocated"),
+          align: "end",
           sortable: true,
-          value: 'unallocated_amount',
+          value: "unallocated_amount",
         },
       ],
       mpesa_payment_headers: [
         {
-          text: __('Payment ID'),
-          align: 'start',
+          text: __("Payment ID"),
+          align: "start",
           sortable: true,
-          value: 'transid',
+          value: "transid",
         },
         {
-          text: __('Full Name'),
-          align: 'start',
+          text: __("Full Name"),
+          align: "start",
           sortable: true,
-          value: 'full_name',
+          value: "full_name",
         },
         {
-          text: __('Nobile Number'),
-          align: 'start',
+          text: __("Nobile Number"),
+          align: "start",
           sortable: true,
-          value: 'mobile_no',
+          value: "mobile_no",
         },
         {
-          text: __('Date'),
-          align: 'start',
+          text: __("Date"),
+          align: "start",
           sortable: true,
-          value: 'posting_date',
+          value: "posting_date",
         },
         {
-          text: __('Amount'),
-          align: 'end',
+          text: __("Amount"),
+          align: "end",
           sortable: true,
-          value: 'amount',
+          value: "amount",
         },
       ],
     };
@@ -489,7 +489,7 @@ export default {
   methods: {
     check_opening_entry() {
       return frappe
-        .call('posawesome.posawesome.api.posapp.check_opening_shift', {
+        .call("posawesome.posawesome.api.posapp.check_opening_shift", {
           user: frappe.session.user,
         })
         .then((r) => {
@@ -497,8 +497,8 @@ export default {
             this.pos_profile = r.message.pos_profile;
             this.pos_opening_shift = r.message.pos_opening_shift;
             this.company = r.message.company.name;
-            evntBus.$emit('payments_register_pos_profile', r.message);
-            evntBus.$emit('set_company', r.message.company);
+            evntBus.$emit("payments_register_pos_profile", r.message);
+            evntBus.$emit("set_company", r.message.company);
             this.set_payment_methods();
             this.pos_profile_search = r.message.pos_profile.name;
             this.pos_profiles_list.push(this.pos_profile_search);
@@ -518,7 +518,7 @@ export default {
       if (!this.pos_profile.posa_allow_mpesa_reconcile_payments) return;
       return frappe
         .call(
-          'posawesome.posawesome.api.payment_entry.get_available_pos_profiles',
+          "posawesome.posawesome.api.payment_entry.get_available_pos_profiles",
           {
             company: this.company,
             currency: this.pos_profile.currency,
@@ -537,7 +537,7 @@ export default {
       const vm = this;
       if (this.customer_name) {
         frappe.call({
-          method: 'posawesome.posawesome.api.posapp.get_customer_info',
+          method: "posawesome.posawesome.api.posapp.get_customer_info",
           args: {
             customer: vm.customer_name,
           },
@@ -549,20 +549,20 @@ export default {
                 ...message,
               };
               vm.set_mpesa_search_params();
-              evntBus.$emit('set_customer_info_to_edit', vm.customer_info);
+              evntBus.$emit("set_customer_info_to_edit", vm.customer_info);
             }
           },
         });
       }
     },
     onInvoiceSelected(event) {
-      evntBus.$emit('set_customer', event.item.customer);
+      evntBus.$emit("set_customer", event.item.customer);
     },
     get_outstanding_invoices() {
       this.invoices_loading = true;
       return frappe
         .call(
-          'posawesome.posawesome.api.payment_entry.get_outstanding_invoices',
+          "posawesome.posawesome.api.payment_entry.get_outstanding_invoices",
           {
             customer: this.customer_name,
             company: this.company,
@@ -587,7 +587,7 @@ export default {
       }
       return frappe
         .call(
-          'posawesome.posawesome.api.payment_entry.get_unallocated_payments',
+          "posawesome.posawesome.api.payment_entry.get_unallocated_payments",
           {
             customer: this.customer_name,
             company: this.company,
@@ -604,11 +604,11 @@ export default {
     set_mpesa_search_params() {
       if (!this.pos_profile.posa_allow_mpesa_reconcile_payments) return;
       if (!this.customer_name) return;
-      this.mpesa_search_name = this.customer_info.customer_name.split(' ')[0];
+      this.mpesa_search_name = this.customer_info.customer_name.split(" ")[0];
       if (this.customer_info.mobile_no) {
         this.mpesa_search_mobile =
           this.customer_info.mobile_no.substring(0, 4) +
-          ' ***** ' +
+          " ***** " +
           this.customer_info.mobile_no.substring(9);
       }
     },
@@ -617,7 +617,7 @@ export default {
       const vm = this;
       this.mpesa_payments_loading = true;
       return frappe
-        .call('posawesome.posawesome.api.m_pesa.get_mpesa_draft_payments', {
+        .call("posawesome.posawesome.api.m_pesa.get_mpesa_draft_payments", {
           company: vm.company,
           mode_of_payment: null,
           full_name: vm.mpesa_search_name || null,
@@ -646,12 +646,12 @@ export default {
       });
     },
     clear_all(with_customer_info = true) {
-      this.customer_name = '';
+      this.customer_name = "";
       if (with_customer_info) {
-        this.customer_info = '';
+        this.customer_info = "";
       }
-      this.mpesa_search_mobile = '';
-      this.mpesa_search_name = '';
+      this.mpesa_search_mobile = "";
+      this.mpesa_search_name = "";
       this.mpesa_payments = [];
       this.selected_mpesa_payments = [];
       this.outstanding_invoices = [];
@@ -665,7 +665,7 @@ export default {
       const customer = this.customer_name;
       const vm = this;
       if (!customer) {
-        frappe.throw(__('Please select a customer'));
+        frappe.throw(__("Please select a customer"));
         return;
       }
       if (
@@ -673,14 +673,14 @@ export default {
         this.total_selected_mpesa_payments == 0 &&
         this.total_payment_methods == 0
       ) {
-        frappe.throw(__('Please make a payment or select an payment'));
+        frappe.throw(__("Please make a payment or select an payment"));
         return;
       }
       if (
         this.total_selected_payments > 0 &&
         this.selected_invoices.length == 0
       ) {
-        frappe.throw(__('Please select an invoice'));
+        frappe.throw(__("Please select an invoice"));
         return;
       }
 
@@ -707,13 +707,13 @@ export default {
       );
 
       frappe.call({
-        method: 'posawesome.posawesome.api.payment_entry.process_pos_payment',
+        method: "posawesome.posawesome.api.payment_entry.process_pos_payment",
         args: { payload },
         freeze: true,
-        freeze_message: __('Processing Payment'),
+        freeze_message: __("Processing Payment"),
         callback: function (r) {
           if (r.message) {
-            frappe.utils.play_sound('submit');
+            frappe.utils.play_sound("submit");
             vm.clear_all(false);
             vm.customer_name = customer;
             vm.get_outstanding_invoices();
@@ -776,7 +776,7 @@ export default {
   mounted: function () {
     this.$nextTick(function () {
       this.check_opening_entry();
-      evntBus.$on('update_customer', (customer_name) => {
+      evntBus.$on("update_customer", (customer_name) => {
         this.clear_all(true);
         this.customer_name = customer_name;
         this.fetch_customer_details();
@@ -784,14 +784,14 @@ export default {
         this.get_unallocated_payments();
         this.get_draft_mpesa_payments_register();
       });
-      evntBus.$on('fetch_customer_details', () => {
+      evntBus.$on("fetch_customer_details", () => {
         this.fetch_customer_details();
       });
     });
   },
   beforeDestroy() {
-    evntBus.$off('update_customer');
-    evntBus.$off('fetch_customer_details');
+    evntBus.$off("update_customer");
+    evntBus.$off("fetch_customer_details");
   },
 };
 </script>
diff --git a/posawesome/public/js/posapp/components/pos/Invoice.vue b/posawesome/public/js/posapp/components/pos/Invoice.vue
index 0805b1bf..83dc35ab 100644
--- a/posawesome/public/js/posapp/components/pos/Invoice.vue
+++ b/posawesome/public/js/posapp/components/pos/Invoice.vue
@@ -4,16 +4,16 @@
       <v-card>
         <v-card-title class="text-h5">
           <span class="headline primary--text">{{
-            __('Cancel Current Invoice ?')
+            __("Cancel Current Invoice ?")
           }}</span>
         </v-card-title>
         <v-card-actions>
           <v-spacer></v-spacer>
           <v-btn color="error" @click="cancel_invoice">
-            {{ __('Cancel') }}
+            {{ __("Cancel") }}
           </v-btn>
           <v-btn color="warning" @click="cancel_dialog = false">
-            {{ __('Back') }}
+            {{ __("Back") }}
           </v-btn>
         </v-card-actions>
       </v-card>
@@ -750,7 +750,7 @@
                 color="warning"
                 dark
                 @click="get_draft_invoices"
-                >{{ __('Held') }}</v-btn
+                >{{ __("Held") }}</v-btn
               >
             </v-col>
             <v-col cols="6" class="pa-1">
@@ -761,7 +761,7 @@
                 color="secondary"
                 dark
                 @click="open_returns"
-                >{{ __('Return') }}</v-btn
+                >{{ __("Return") }}</v-btn
               >
             </v-col>
             <v-col cols="6" class="pa-1">
@@ -771,7 +771,7 @@
                 color="error"
                 dark
                 @click="cancel_dialog = true"
-                >{{ __('Cancel') }}</v-btn
+                >{{ __("Cancel") }}</v-btn
               >
             </v-col>
             <v-col cols="6" class="pa-1">
@@ -781,7 +781,7 @@
                 color="accent"
                 dark
                 @click="new_invoice"
-                >{{ __('Save/New') }}</v-btn
+                >{{ __("Save/New") }}</v-btn
               >
             </v-col>
             <v-col class="pa-1">
@@ -791,7 +791,7 @@
                 color="success"
                 @click="show_payment"
                 dark
-                >{{ __('PAY') }}</v-btn
+                >{{ __("PAY") }}</v-btn
               >
             </v-col>
             <v-col
@@ -805,7 +805,7 @@
                 color="primary"
                 @click="print_draft_invoice"
                 dark
-                >{{ __('Print Draft') }}</v-btn
+                >{{ __("Print Draft") }}</v-btn
               >
             </v-col>
           </v-row>
@@ -816,21 +816,21 @@
 </template>
 
 <script>
-import { evntBus } from '../../bus';
-import format from '../../format';
-import Customer from './Customer.vue';
+import { evntBus } from "../../bus";
+import format from "../../format";
+import Customer from "./Customer.vue";
 
 export default {
   mixins: [format],
   data() {
     return {
-      pos_profile: '',
-      pos_opening_shift: '',
-      stock_settings: '',
-      invoice_doc: '',
-      return_doc: '',
-      customer: '',
-      customer_info: '',
+      pos_profile: "",
+      pos_opening_shift: "",
+      stock_settings: "",
+      invoice_doc: "",
+      return_doc: "",
+      customer: "",
+      customer_info: "",
       discount_amount: 0,
       additional_discount_percentage: 0,
       total_tax: 0,
@@ -840,8 +840,8 @@ export default {
       posa_coupons: [],
       allItems: [],
       discount_percentage_offer_name: null,
-      invoiceTypes: ['Invoice', 'Order'],
-      invoiceType: 'Invoice',
+      invoiceTypes: ["Invoice", "Order"],
+      invoiceType: "Invoice",
       itemsPerPage: 1000,
       expanded: [],
       singleExpand: true,
@@ -856,16 +856,16 @@ export default {
       posting_date: frappe.datetime.nowdate(),
       items_headers: [
         {
-          text: __('Name'),
-          align: 'start',
+          text: __("Name"),
+          align: "start",
           sortable: true,
-          value: 'item_name',
+          value: "item_name",
         },
-        { text: __('QTY'), value: 'qty', align: 'center' },
-        { text: __('UOM'), value: 'uom', align: 'center' },
-        { text: __('Rate'), value: 'rate', align: 'center' },
-        { text: __('Amount'), value: 'amount', align: 'center' },
-        { text: __('is Offer'), value: 'posa_is_offer', align: 'center' },
+        { text: __("QTY"), value: "qty", align: "center" },
+        { text: __("UOM"), value: "uom", align: "center" },
+        { text: __("Rate"), value: "rate", align: "center" },
+        { text: __("Amount"), value: "amount", align: "center" },
+        { text: __("is Offer"), value: "posa_is_offer", align: "center" },
       ],
     };
   },
@@ -947,7 +947,7 @@ export default {
         item.uom = item.stock_uom;
       }
       let index = -1;
-      if (!this.new_item) {
+      if (!this.new_line) {
         index = this.items.findIndex(
           (el) =>
             el.item_code === item.item_code &&
@@ -977,11 +977,11 @@ export default {
         this.update_items_details([cur_item]);
         if (item.has_serial_no && item.to_set_serial_no) {
           if (cur_item.serial_no_selected.includes(item.to_set_serial_no)) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(`This Serial Number {0} has already been added!`, [
                 item.to_set_serial_no,
               ]),
-              color: 'warning',
+              color: "warning",
             });
             item.to_set_serial_no = null;
             return;
@@ -1003,8 +1003,8 @@ export default {
           } else {
             const new_item = this.get_new_item(cur_item);
             new_item.batch_no = item.batch_no || item.to_set_batch_no;
-            new_item.batch_no_expiry_date = '';
-            new_item.actual_batch_qty = '';
+            new_item.batch_no_expiry_date = "";
+            new_item.actual_batch_qty = "";
             new_item.qty = item.qty || 1;
             if (new_item.batch_no) {
               this.set_batch_qty(new_item, new_item.batch_no, false);
@@ -1028,7 +1028,7 @@ export default {
         item.posa_is_offer = 0;
       }
       if (!item.posa_is_replace) {
-        item.posa_is_replace = '';
+        item.posa_is_replace = "";
       }
       new_item.stock_qty = item.qty;
       new_item.discount_amount = 0;
@@ -1037,15 +1037,15 @@ export default {
       new_item.price_list_rate = item.rate;
       new_item.qty = item.qty;
       new_item.uom = item.uom ? item.uom : item.stock_uom;
-      new_item.actual_batch_qty = '';
+      new_item.actual_batch_qty = "";
       new_item.conversion_factor = 1;
       new_item.posa_offers = JSON.stringify([]);
       new_item.posa_offer_applied = 0;
       new_item.posa_is_offer = item.posa_is_offer;
       new_item.posa_is_replace = item.posa_is_replace || null;
       new_item.is_free_item = 0;
-      new_item.posa_notes = '';
-      new_item.posa_delivery_date = '';
+      new_item.posa_notes = "";
+      new_item.posa_delivery_date = "";
       new_item.posa_row_id = this.makeid(20);
       if (
         (!this.pos_profile.posa_auto_set_batch && new_item.has_batch_no) ||
@@ -1058,19 +1058,19 @@ export default {
 
     cancel_invoice() {
       const doc = this.get_invoice_doc();
-      this.invoiceType = 'Invoice';
-      this.invoiceTypes = ['Invoice', 'Order'];
+      this.invoiceType = "Invoice";
+      this.invoiceTypes = ["Invoice", "Order"];
       this.posting_date = frappe.datetime.nowdate();
       if (doc.name && this.pos_profile.posa_allow_delete) {
         frappe.call({
-          method: 'posawesome.posawesome.api.posapp.delete_invoice',
+          method: "posawesome.posawesome.api.posapp.delete_invoice",
           args: { invoice: doc.name },
           async: true,
           callback: function (r) {
             if (r.message) {
-              evntBus.$emit('show_mesage', {
+              evntBus.$emit("show_mesage", {
                 text: r.message,
-                color: 'warning',
+                color: "warning",
               });
             }
           },
@@ -1078,27 +1078,27 @@ export default {
       }
       this.items = [];
       this.posa_offers = [];
-      evntBus.$emit('set_pos_coupons', []);
+      evntBus.$emit("set_pos_coupons", []);
       this.posa_coupons = [];
       this.customer = this.pos_profile.customer;
-      this.invoice_doc = '';
-      this.return_doc = '';
+      this.invoice_doc = "";
+      this.return_doc = "";
       this.discount_amount = 0;
       this.additional_discount_percentage = 0;
       this.delivery_charges_rate = 0;
       this.selcted_delivery_charges = {};
-      evntBus.$emit('set_customer_readonly', false);
+      evntBus.$emit("set_customer_readonly", false);
       this.cancel_dialog = false;
     },
 
     new_invoice(data = {}) {
       let old_invoice = null;
-      evntBus.$emit('set_customer_readonly', false);
+      evntBus.$emit("set_customer_readonly", false);
       this.expanded = [];
       this.posa_offers = [];
-      evntBus.$emit('set_pos_coupons', []);
+      evntBus.$emit("set_pos_coupons", []);
       this.posa_coupons = [];
-      this.return_doc = '';
+      this.return_doc = "";
       const doc = this.get_invoice_doc();
       if (doc.name) {
         old_invoice = this.update_invoice(doc);
@@ -1110,16 +1110,16 @@ export default {
       if (!data.name && !data.is_return) {
         this.items = [];
         this.customer = this.pos_profile.customer;
-        this.invoice_doc = '';
+        this.invoice_doc = "";
         this.discount_amount = 0;
         this.additional_discount_percentage = 0;
-        this.invoiceType = 'Invoice';
-        this.invoiceTypes = ['Invoice', 'Order'];
+        this.invoiceType = "Invoice";
+        this.invoiceTypes = ["Invoice", "Order"];
       } else {
         if (data.is_return) {
-          evntBus.$emit('set_customer_readonly', true);
-          this.invoiceType = 'Return';
-          this.invoiceTypes = ['Return'];
+          evntBus.$emit("set_customer_readonly", true);
+          this.invoiceType = "Return";
+          this.invoiceTypes = ["Return"];
         }
         this.invoice_doc = data;
         this.items = data.items;
@@ -1141,7 +1141,7 @@ export default {
         this.items.forEach((item) => {
           if (item.serial_no) {
             item.serial_no_selected = [];
-            const serial_list = item.serial_no.split('\n');
+            const serial_list = item.serial_no.split("\n");
             serial_list.forEach((element) => {
               if (element.length) {
                 item.serial_no_selected.push(element);
@@ -1159,7 +1159,7 @@ export default {
       if (this.invoice_doc.name) {
         doc = { ...this.invoice_doc };
       }
-      doc.doctype = 'Sales Invoice';
+      doc.doctype = "Sales Invoice";
       doc.is_pos = 1;
       doc.ignore_pricing_rule = 1;
       doc.company = doc.company || this.pos_profile.company;
@@ -1224,7 +1224,7 @@ export default {
           amount: 0,
           mode_of_payment: payment.mode_of_payment,
           default: payment.default,
-          account: '',
+          account: "",
         });
       });
       return payments;
@@ -1233,7 +1233,7 @@ export default {
     update_invoice(doc) {
       const vm = this;
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.update_invoice',
+        method: "posawesome.posawesome.api.posapp.update_invoice",
         args: {
           data: doc,
         },
@@ -1258,52 +1258,72 @@ export default {
 
     show_payment() {
       if (!this.customer) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: __(`There is no Customer !`),
-          color: 'error',
+          color: "error",
         });
         return;
       }
       if (!this.items.length) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: __(`There is no Items !`),
-          color: 'error',
+          color: "error",
         });
         return;
       }
       if (!this.validate()) {
         return;
       }
-      evntBus.$emit('show_payment', 'true');
+      evntBus.$emit("show_payment", "true");
       const invoice_doc = this.proces_invoice();
-      evntBus.$emit('send_invoice_doc_payment', invoice_doc);
+      evntBus.$emit("send_invoice_doc_payment", invoice_doc);
     },
 
     validate() {
       let value = true;
       this.items.forEach((item) => {
+        if (this.pos_profile.posa_max_discount_allowed) {
+          if (item.discount_amount && this.flt(item.discount_amount) > 0) {
+            // calc discount percentage
+            const discount_percentage =
+              (this.flt(item.discount_amount) * 100) /
+              this.flt(item.price_list_rate);
+            if (
+              discount_percentage > this.pos_profile.posa_max_discount_allowed
+            ) {
+              evntBus.$emit("show_mesage", {
+                text: __(
+                  `Discount percentage for item '{0}' cannot be greater than {1}%`,
+                  [item.item_name, this.pos_profile.posa_max_discount_allowed]
+                ),
+                color: "error",
+              });
+              value = false;
+            }
+          }
+        }
         if (this.stock_settings.allow_negative_stock != 1) {
           if (
-            this.invoiceType == 'Invoice' &&
+            this.invoiceType == "Invoice" &&
             ((item.is_stock_item && item.stock_qty && !item.actual_qty) ||
               (item.is_stock_item && item.stock_qty > item.actual_qty))
           ) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(
                 `The existing quantity '{0}' for item '{1}' is not enough`,
                 [item.actual_qty, item.item_name]
               ),
-              color: 'error',
+              color: "error",
             });
             value = false;
           }
         }
         if (item.qty == 0) {
-          evntBus.$emit('show_mesage', {
+          evntBus.$emit("show_mesage", {
             text: __(`Quantity for item '{0}' cannot be Zero (0)`, [
               item.item_name,
             ]),
-            color: 'error',
+            color: "error",
           });
           value = false;
         }
@@ -1311,12 +1331,12 @@ export default {
           item.max_discount > 0 &&
           item.discount_percentage > item.max_discount
         ) {
-          evntBus.$emit('show_mesage', {
+          evntBus.$emit("show_mesage", {
             text: __(`Maximum discount for Item {0} is {1}%`, [
               item.item_name,
               item.max_discount,
             ]),
-            color: 'error',
+            color: "error",
           });
           value = false;
         }
@@ -1326,23 +1346,23 @@ export default {
             (!item.serial_no_selected ||
               item.stock_qty != item.serial_no_selected.length)
           ) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(`Selected serial numbers of item {0} is incorrect`, [
                 item.item_name,
               ]),
-              color: 'error',
+              color: "error",
             });
             value = false;
           }
         }
         if (item.has_batch_no) {
           if (item.stock_qty > item.actual_batch_qty) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(
                 `The existing batch quantity of item {0} is not enough`,
                 [item.item_name]
               ),
-              color: 'error',
+              color: "error",
             });
             value = false;
           }
@@ -1350,30 +1370,30 @@ export default {
         if (this.pos_profile.posa_allow_user_to_edit_additional_discount) {
           const clac_percentage = (this.discount_amount / this.Total) * 100;
           if (clac_percentage > this.pos_profile.posa_max_discount_allowed) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(`The discount should not be higher than {0}%`, [
                 this.pos_profile.posa_max_discount_allowed,
               ]),
-              color: 'error',
+              color: "error",
             });
             value = false;
           }
         }
         if (this.invoice_doc.is_return) {
           if (this.subtotal >= 0) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(`Return Invoice Total Not Correct`),
-              color: 'error',
+              color: "error",
             });
             value = false;
             return value;
           }
           if (this.subtotal * -1 > this.return_doc.total) {
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("show_mesage", {
               text: __(`Return Invoice Total should not be higher than {0}`, [
                 this.return_doc.total,
               ]),
-              color: 'error',
+              color: "error",
             });
             value = false;
             return value;
@@ -1384,22 +1404,22 @@ export default {
             );
 
             if (!return_item) {
-              evntBus.$emit('show_mesage', {
+              evntBus.$emit("show_mesage", {
                 text: __(
                   `The item {0} cannot be returned because it is not in the invoice {1}`,
                   [item.item_name, this.return_doc.name]
                 ),
-                color: 'error',
+                color: "error",
               });
               value = false;
               return value;
             } else if (item.qty * -1 > return_item.qty || item.qty >= 0) {
-              evntBus.$emit('show_mesage', {
+              evntBus.$emit("show_mesage", {
                 text: __(`The QTY of the item {0} cannot be greater than {1}`, [
                   item.item_name,
                   return_item.qty,
                 ]),
-                color: 'error',
+                color: "error",
               });
               value = false;
               return value;
@@ -1413,25 +1433,25 @@ export default {
     get_draft_invoices() {
       const vm = this;
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_draft_invoices',
+        method: "posawesome.posawesome.api.posapp.get_draft_invoices",
         args: {
           pos_opening_shift: this.pos_opening_shift.name,
         },
         async: false,
         callback: function (r) {
           if (r.message) {
-            evntBus.$emit('open_drafts', r.message);
+            evntBus.$emit("open_drafts", r.message);
           }
         },
       });
     },
 
     open_returns() {
-      evntBus.$emit('open_returns', this.pos_profile.company);
+      evntBus.$emit("open_returns", this.pos_profile.company);
     },
 
     close_payments() {
-      evntBus.$emit('show_payment', 'false');
+      evntBus.$emit("show_payment", "false");
     },
 
     update_items_details(items) {
@@ -1441,7 +1461,7 @@ export default {
       const vm = this;
       if (!vm.pos_profile) return;
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_items_details',
+        method: "posawesome.posawesome.api.posapp.get_items_details",
         async: false,
         args: {
           pos_profile: vm.pos_profile,
@@ -1468,7 +1488,7 @@ export default {
     update_item_detail(item) {
       const vm = this;
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_item_detail',
+        method: "posawesome.posawesome.api.posapp.get_item_detail",
         args: {
           warehouse: this.pos_profile.warehouse,
           doc: this.get_invoice_doc(),
@@ -1476,20 +1496,20 @@ export default {
           item: {
             item_code: item.item_code,
             customer: this.customer,
-            doctype: 'Sales Invoice',
-            name: 'New Sales Invoice 1',
+            doctype: "Sales Invoice",
+            name: "New Sales Invoice 1",
             company: this.pos_profile.company,
             conversion_rate: 1,
             qty: item.qty,
             price_list_rate: item.price_list_rate,
-            child_docname: 'New Sales Invoice Item 1',
+            child_docname: "New Sales Invoice Item 1",
             cost_center: this.pos_profile.cost_center,
             currency: this.pos_profile.currency,
             // plc_conversion_rate: 1,
             pos_profile: this.pos_profile.name,
             uom: item.uom,
-            tax_category: '',
-            transaction_type: 'selling',
+            tax_category: "",
+            transaction_type: "selling",
             update_stock: this.pos_profile.update_stock,
             price_list: this.get_price_list(),
             has_batch_no: item.has_batch_no,
@@ -1501,13 +1521,16 @@ export default {
         callback: function (r) {
           if (r.message) {
             const data = r.message;
+            if (data.batch_no_data) {
+              item.batch_no_data = data.batch_no_data;
+            }
             if (
               item.has_batch_no &&
               vm.pos_profile.posa_auto_set_batch &&
               !item.batch_no &&
-              data.batch_no
+              data.batch_no_data
             ) {
-              item.batch_no = data.batch_no;
+              item.batch_no_data = data.batch_no_data;
               vm.set_batch_qty(item, item.batch_no, false);
             }
             if (data.has_pricing_rule) {
@@ -1559,7 +1582,7 @@ export default {
       const vm = this;
       if (this.customer) {
         frappe.call({
-          method: 'posawesome.posawesome.api.posapp.get_customer_info',
+          method: "posawesome.posawesome.api.posapp.get_customer_info",
           args: {
             customer: vm.customer,
           },
@@ -1600,7 +1623,7 @@ export default {
       if (price_list == this.pos_profile.selling_price_list) {
         price_list = null;
       }
-      evntBus.$emit('update_customer_price_list', price_list);
+      evntBus.$emit("update_customer_price_list", price_list);
     },
     update_discount_umount() {
       const value = flt(this.additional_discount_percentage);
@@ -1613,7 +1636,7 @@ export default {
     },
 
     calc_prices(item, value, $event) {
-      if (event.target.id === 'rate') {
+      if (event.target.id === "rate") {
         item.discount_percentage = 0;
         if (value < item.price_list_rate) {
           item.discount_amount = this.flt(
@@ -1626,7 +1649,7 @@ export default {
         } else if (value > item.price_list_rate) {
           item.discount_amount = 0;
         }
-      } else if (event.target.id === 'discount_amount') {
+      } else if (event.target.id === "discount_amount") {
         if (value < 0) {
           item.discount_amount = 0;
           item.discount_percentage = 0;
@@ -1634,7 +1657,7 @@ export default {
           item.rate = flt(item.price_list_rate) - flt(value);
           item.discount_percentage = 0;
         }
-      } else if (event.target.id === 'discount_percentage') {
+      } else if (event.target.id === "discount_percentage") {
         if (value < 0) {
           item.discount_amount = 0;
           item.discount_percentage = 0;
@@ -1693,9 +1716,9 @@ export default {
 
     set_serial_no(item) {
       if (!item.has_serial_no) return;
-      item.serial_no = '';
+      item.serial_no = "";
       item.serial_no_selected.forEach((element) => {
-        item.serial_no += element + '\n';
+        item.serial_no += element + "\n";
       });
       item.serial_no_selected_count = item.serial_no_selected.length;
       if (item.serial_no_selected_count != item.stock_qty) {
@@ -1706,37 +1729,96 @@ export default {
     },
 
     set_batch_qty(item, value, update = true) {
-      const batch_no = item.batch_no_data.find(
-        (element) => element.batch_no == value
+      const existing_items = this.items.filter(
+        (element) =>
+          element.item_code == item.item_code &&
+          element.posa_row_id != item.posa_row_id
       );
-      item.actual_batch_qty = batch_no.batch_qty;
-      item.batch_no_expiry_date = batch_no.expiry_date;
-      if (batch_no.batch_price) {
-        item.batch_price = batch_no.batch_price;
-        item.price_list_rate = batch_no.batch_price;
-        item.rate = batch_no.batch_price;
-      } else if (update) {
+      const used_batches = {};
+      item.batch_no_data.forEach((batch) => {
+        used_batches[batch.batch_no] = {
+          ...batch,
+          used_qty: 0,
+          remaining_qty: batch.batch_qty,
+        };
+        existing_items.forEach((element) => {
+          if (element.batch_no && element.batch_no == batch.batch_no) {
+            used_batches[batch.batch_no].used_qty += element.qty;
+            used_batches[batch.batch_no].remaining_qty -= element.qty;
+            used_batches[batch.batch_no].batch_qty -= element.qty;
+          }
+        });
+      });
+
+      // set item batch_no based on:
+      // 1. if batch has expiry_date we should use the batch with the nearest expiry_date
+      // 2. if batch has no expiry_date we should use the batch with the earliest manufacturing_date
+      // 3. we should not use batch with remaining_qty = 0
+      // 4. we should the highest remaining_qty
+      const batch_no_data = Object.values(used_batches)
+        .filter((batch) => batch.remaining_qty > 0)
+        .sort((a, b) => {
+          if (a.expiry_date && b.expiry_date) {
+            return a.expiry_date - b.expiry_date;
+          } else if (a.expiry_date) {
+            return -1;
+          } else if (b.expiry_date) {
+            return 1;
+          } else if (a.manufacturing_date && b.manufacturing_date) {
+            return a.manufacturing_date - b.manufacturing_date;
+          } else if (a.manufacturing_date) {
+            return -1;
+          } else if (b.manufacturing_date) {
+            return 1;
+          } else {
+            return b.remaining_qty - a.remaining_qty;
+          }
+        });
+      if (batch_no_data.length > 0) {
+        let batch_to_use = null;
+        if (value) {
+          batch_to_use = batch_no_data.find((batch) => batch.batch_no == value);
+        }
+        if (!batch_to_use) {
+          batch_to_use = batch_no_data[0];
+        }
+        item.batch_no = batch_to_use.batch_no;
+        item.actual_batch_qty = batch_to_use.batch_qty;
+        item.batch_no_expiry_date = batch_to_use.expiry_date;
+        if (batch_to_use.batch_price) {
+          item.batch_price = batch_to_use.batch_price;
+          item.price_list_rate = batch_to_use.batch_price;
+          item.rate = batch_to_use.batch_price;
+        } else if (update) {
+          item.batch_price = null;
+          this.update_item_detail(item);
+        }
+      } else {
+        item.batch_no = null;
+        item.actual_batch_qty = null;
+        item.batch_no_expiry_date = null;
         item.batch_price = null;
-        this.update_item_detail(item);
       }
+      // update item batch_no_data from batch_no_data
+      item.batch_no_data = batch_no_data;
     },
 
     shortOpenPayment(e) {
-      if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
+      if (e.key === "s" && (e.ctrlKey || e.metaKey)) {
         e.preventDefault();
         this.show_payment();
       }
     },
 
     shortDeleteFirstItem(e) {
-      if (e.key === 'd' && (e.ctrlKey || e.metaKey)) {
+      if (e.key === "d" && (e.ctrlKey || e.metaKey)) {
         e.preventDefault();
         this.remove_item(this.items[0]);
       }
     },
 
     shortOpenFirstItem(e) {
-      if (e.key === 'a' && (e.ctrlKey || e.metaKey)) {
+      if (e.key === "a" && (e.ctrlKey || e.metaKey)) {
         e.preventDefault();
         this.expanded = [];
         this.expanded.push(this.items[0]);
@@ -1744,15 +1826,15 @@ export default {
     },
 
     shortSelectDiscount(e) {
-      if (e.key === 'z' && (e.ctrlKey || e.metaKey)) {
+      if (e.key === "z" && (e.ctrlKey || e.metaKey)) {
         e.preventDefault();
         this.$refs.discount.focus();
       }
     },
 
     makeid(length) {
-      let result = '';
-      const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+      let result = "";
+      const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
       const charactersLength = characters.length;
       for (var i = 0; i < length; i++) {
         result += characters.charAt(
@@ -1778,22 +1860,22 @@ export default {
     handelOffers() {
       const offers = [];
       this.posOffers.forEach((offer) => {
-        if (offer.apply_on === 'Item Code') {
+        if (offer.apply_on === "Item Code") {
           const itemOffer = this.getItemOffer(offer);
           if (itemOffer) {
             offers.push(itemOffer);
           }
-        } else if (offer.apply_on === 'Item Group') {
+        } else if (offer.apply_on === "Item Group") {
           const groupOffer = this.getGroupOffer(offer);
           if (groupOffer) {
             offers.push(groupOffer);
           }
-        } else if (offer.apply_on === 'Brand') {
+        } else if (offer.apply_on === "Brand") {
           const brandOffer = this.getBrandOffer(offer);
           if (brandOffer) {
             offers.push(brandOffer);
           }
-        } else if (offer.apply_on === 'Transaction') {
+        } else if (offer.apply_on === "Transaction") {
           const transactionOffer = this.getTransactionOffer(offer);
           if (transactionOffer) {
             offers.push(transactionOffer);
@@ -1809,15 +1891,15 @@ export default {
       // Set item give offer for replace
       offers.forEach((offer) => {
         if (
-          offer.apply_on == 'Item Code' &&
-          offer.apply_type == 'Item Code' &&
+          offer.apply_on == "Item Code" &&
+          offer.apply_type == "Item Code" &&
           offer.replace_item
         ) {
           offer.give_item = offer.item;
           offer.apply_item_code = offer.item;
         } else if (
-          offer.apply_on == 'Item Group' &&
-          offer.apply_type == 'Item Group' &&
+          offer.apply_on == "Item Group" &&
+          offer.apply_type == "Item Group" &&
           offer.replace_cheapest_item
         ) {
           const offerItemCode = this.getCheapestItem(offer).item_code;
@@ -1829,7 +1911,7 @@ export default {
 
     getCheapestItem(offer) {
       let itemsRowID;
-      if (typeof offer.items === 'string') {
+      if (typeof offer.items === "string") {
         itemsRowID = JSON.parse(offer.items);
       } else {
         itemsRowID = offer.items;
@@ -1917,13 +1999,13 @@ export default {
 
     getItemOffer(offer) {
       let apply_offer = null;
-      if (offer.apply_on === 'Item Code') {
+      if (offer.apply_on === "Item Code") {
         if (this.checkOfferCoupon(offer)) {
           this.items.forEach((item) => {
             if (!item.posa_is_offer && item.item_code === offer.item) {
               const items = [];
               if (
-                offer.offer === 'Item Price' &&
+                offer.offer === "Item Price" &&
                 item.posa_offer_applied &&
                 !this.checkOfferIsAppley(item, offer)
               ) {
@@ -1948,7 +2030,7 @@ export default {
 
     getGroupOffer(offer) {
       let apply_offer = null;
-      if (offer.apply_on === 'Item Group') {
+      if (offer.apply_on === "Item Group") {
         if (this.checkOfferCoupon(offer)) {
           const items = [];
           let total_count = 0;
@@ -1956,7 +2038,7 @@ export default {
           this.items.forEach((item) => {
             if (!item.posa_is_offer && item.item_group === offer.item_group) {
               if (
-                offer.offer === 'Item Price' &&
+                offer.offer === "Item Price" &&
                 item.posa_offer_applied &&
                 !this.checkOfferIsAppley(item, offer)
               ) {
@@ -1985,7 +2067,7 @@ export default {
 
     getBrandOffer(offer) {
       let apply_offer = null;
-      if (offer.apply_on === 'Brand') {
+      if (offer.apply_on === "Brand") {
         if (this.checkOfferCoupon(offer)) {
           const items = [];
           let total_count = 0;
@@ -1993,7 +2075,7 @@ export default {
           this.items.forEach((item) => {
             if (!item.posa_is_offer && item.brand === offer.brand) {
               if (
-                offer.offer === 'Item Price' &&
+                offer.offer === "Item Price" &&
                 item.posa_offer_applied &&
                 !this.checkOfferIsAppley(item, offer)
               ) {
@@ -2021,7 +2103,7 @@ export default {
     },
     getTransactionOffer(offer) {
       let apply_offer = null;
-      if (offer.apply_on === 'Transaction') {
+      if (offer.apply_on === "Transaction") {
         if (this.checkOfferCoupon(offer)) {
           let total_qty = 0;
           this.items.forEach((item) => {
@@ -2052,7 +2134,7 @@ export default {
     },
 
     updatePosOffers(offers) {
-      evntBus.$emit('update_pos_offers', offers);
+      evntBus.$emit("update_pos_offers", offers);
     },
 
     updateInvoiceOffers(offers) {
@@ -2071,7 +2153,7 @@ export default {
         if (existOffer) {
           existOffer.items = JSON.stringify(offer.items);
           if (
-            existOffer.offer === 'Give Product' &&
+            existOffer.offer === "Give Product" &&
             existOffer.give_item &&
             existOffer.give_item != offer.give_item
           ) {
@@ -2122,7 +2204,7 @@ export default {
             existOffer.give_item_row_id = newItemOffer.posa_row_id;
             existOffer.give_item = newItemOffer.item_code;
           } else if (
-            existOffer.offer === 'Give Product' &&
+            existOffer.offer === "Give Product" &&
             existOffer.give_item &&
             existOffer.give_item == offer.give_item &&
             (offer.replace_item || offer.replace_cheapest_item)
@@ -2155,9 +2237,9 @@ export default {
                 }
               }
             });
-          } else if (existOffer.offer === 'Item Price') {
+          } else if (existOffer.offer === "Item Price") {
             this.ApplyOnPrice(offer);
-          } else if (existOffer.offer === 'Grand Total') {
+          } else if (existOffer.offer === "Grand Total") {
             this.ApplyOnTotal(offer);
           }
           this.addOfferToItems(existOffer);
@@ -2168,14 +2250,14 @@ export default {
     },
 
     removeApplyOffer(invoiceOffer) {
-      if (invoiceOffer.offer === 'Item Price') {
+      if (invoiceOffer.offer === "Item Price") {
         this.RemoveOnPrice(invoiceOffer);
         const index = this.posa_offers.findIndex(
           (el) => el.row_id === invoiceOffer.row_id
         );
         this.posa_offers.splice(index, 1);
       }
-      if (invoiceOffer.offer === 'Give Product') {
+      if (invoiceOffer.offer === "Give Product") {
         const item_to_remove = this.items.find(
           (item) => item.posa_row_id == invoiceOffer.give_item_row_id
         );
@@ -2185,14 +2267,14 @@ export default {
         this.posa_offers.splice(index, 1);
         this.remove_item(item_to_remove);
       }
-      if (invoiceOffer.offer === 'Grand Total') {
+      if (invoiceOffer.offer === "Grand Total") {
         this.RemoveOnTotal(invoiceOffer);
         const index = this.posa_offers.findIndex(
           (el) => el.row_id === invoiceOffer.row_id
         );
         this.posa_offers.splice(index, 1);
       }
-      if (invoiceOffer.offer === 'Loyalty Point') {
+      if (invoiceOffer.offer === "Loyalty Point") {
         const index = this.posa_offers.findIndex(
           (el) => el.row_id === invoiceOffer.row_id
         );
@@ -2202,19 +2284,19 @@ export default {
     },
 
     applyNewOffer(offer) {
-      if (offer.offer === 'Item Price') {
+      if (offer.offer === "Item Price") {
         this.ApplyOnPrice(offer);
       }
-      if (offer.offer === 'Give Product') {
+      if (offer.offer === "Give Product") {
         let itemsRowID;
-        if (typeof offer.items === 'string') {
+        if (typeof offer.items === "string") {
           itemsRowID = JSON.parse(offer.items);
         } else {
           itemsRowID = offer.items;
         }
         if (
-          offer.apply_on == 'Item Code' &&
-          offer.apply_type == 'Item Code' &&
+          offer.apply_on == "Item Code" &&
+          offer.apply_type == "Item Code" &&
           offer.replace_item
         ) {
           const item = this.ApplyOnGiveProduct(offer, offer.item);
@@ -2234,8 +2316,8 @@ export default {
           this.items.unshift(item);
           offer.give_item_row_id = item.posa_row_id;
         } else if (
-          offer.apply_on == 'Item Group' &&
-          offer.apply_type == 'Item Group' &&
+          offer.apply_on == "Item Group" &&
+          offer.apply_type == "Item Group" &&
           offer.replace_cheapest_item
         ) {
           const itemsList = [];
@@ -2266,13 +2348,13 @@ export default {
           }
         }
       }
-      if (offer.offer === 'Grand Total') {
+      if (offer.offer === "Grand Total") {
         this.ApplyOnTotal(offer);
       }
-      if (offer.offer === 'Loyalty Point') {
-        evntBus.$emit('show_mesage', {
-          text: __('Loyalty Point Offer Applied'),
-          color: 'success',
+      if (offer.offer === "Loyalty Point") {
+        evntBus.$emit("show_mesage", {
+          text: __("Loyalty Point Offer Applied"),
+          color: "success",
         });
       }
 
@@ -2304,33 +2386,33 @@ export default {
       const new_item = { ...item };
       new_item.qty = offer.given_qty;
       new_item.stock_qty = offer.given_qty;
-      new_item.rate = offer.discount_type === 'Rate' ? offer.rate : item.rate;
+      new_item.rate = offer.discount_type === "Rate" ? offer.rate : item.rate;
       new_item.discount_amount =
-        offer.discount_type === 'Discount Amount' ? offer.discount_amount : 0;
+        offer.discount_type === "Discount Amount" ? offer.discount_amount : 0;
       new_item.discount_percentage =
-        offer.discount_type === 'Discount Percentage'
+        offer.discount_type === "Discount Percentage"
           ? offer.discount_percentage
           : 0;
       new_item.discount_amount_per_item = 0;
       new_item.uom = item.uom ? item.uom : item.stock_uom;
-      new_item.actual_batch_qty = '';
+      new_item.actual_batch_qty = "";
       new_item.conversion_factor = 1;
       new_item.posa_offers = JSON.stringify([]);
       new_item.posa_offer_applied = 0;
       new_item.posa_is_offer = 1;
       new_item.posa_is_replace = null;
-      new_item.posa_notes = '';
-      new_item.posa_delivery_date = '';
+      new_item.posa_notes = "";
+      new_item.posa_delivery_date = "";
       new_item.is_free_item =
-        (offer.discount_type === 'Rate' && !offer.rate) ||
-        (offer.discount_type === 'Discount Percentage' &&
+        (offer.discount_type === "Rate" && !offer.rate) ||
+        (offer.discount_type === "Discount Percentage" &&
           offer.discount_percentage == 0)
           ? 1
           : 0;
       new_item.posa_row_id = this.makeid(20);
       new_item.price_list_rate =
-        (offer.discount_type === 'Rate' && !offer.rate) ||
-        (offer.discount_type === 'Discount Percentage' &&
+        (offer.discount_type === "Rate" && !offer.rate) ||
+        (offer.discount_type === "Discount Percentage" &&
           offer.discount_percentage == 0)
           ? 0
           : item.rate;
@@ -2349,11 +2431,11 @@ export default {
         if (offer.items.includes(item.posa_row_id)) {
           const item_offers = JSON.parse(item.posa_offers);
           if (!item_offers.includes(offer.row_id)) {
-            if (offer.discount_type === 'Rate') {
+            if (offer.discount_type === "Rate") {
               item.rate = offer.rate;
-            } else if (offer.discount_type === 'Discount Percentage') {
+            } else if (offer.discount_type === "Discount Percentage") {
               item.discount_percentage += offer.discount_percentage;
-            } else if (offer.discount_type === 'Discount Amount') {
+            } else if (offer.discount_type === "Discount Amount") {
               item.discount_amount += offer.discount_amount;
             }
             item.posa_offer_applied = 1;
@@ -2371,16 +2453,16 @@ export default {
             (el) => el.name == offer.offer_name
           );
           if (originalOffer) {
-            if (originalOffer.discount_type === 'Rate') {
+            if (originalOffer.discount_type === "Rate") {
               item.rate = item.price_list_rate;
-            } else if (originalOffer.discount_type === 'Discount Percentage') {
+            } else if (originalOffer.discount_type === "Discount Percentage") {
               item.discount_percentage -= offer.discount_percentage;
               if (!item.discount_percentage) {
                 item.discount_percentage = 0;
                 item.discount_amount = 0;
                 item.rate = item.price_list_rate;
               }
-            } else if (originalOffer.discount_type === 'Discount Amount') {
+            } else if (originalOffer.discount_type === "Discount Amount") {
               item.discount_amount -= offer.discount_amount;
             }
             this.calc_item_price(item);
@@ -2425,7 +2507,7 @@ export default {
             const item_offers = JSON.parse(exist_item.posa_offers);
             if (!item_offers.includes(offer.row_id)) {
               item_offers.push(offer.row_id);
-              if (offer.offer === 'Item Price') {
+              if (offer.offer === "Item Price") {
                 exist_item.posa_offer_applied = 1;
               }
             }
@@ -2444,7 +2526,7 @@ export default {
             const updated_item_offers = item_offers.filter(
               (row_id) => row_id != offer.row_id
             );
-            if (offer.offer === 'Item Price') {
+            if (offer.offer === "Item Price") {
               exist_item.posa_offer_applied = 0;
             }
             exist_item.posa_offers = JSON.stringify(updated_item_offers);
@@ -2470,16 +2552,16 @@ export default {
       const letter_head = this.pos_profile.letter_head || 0;
       const url =
         frappe.urllib.get_base_url() +
-        '/printview?doctype=Sales%20Invoice&name=' +
+        "/printview?doctype=Sales%20Invoice&name=" +
         invoice_name +
-        '&trigger_print=1' +
-        '&format=' +
+        "&trigger_print=1" +
+        "&format=" +
         print_format +
-        '&no_letterhead=' +
+        "&no_letterhead=" +
         letter_head;
-      const printWindow = window.open(url, 'Print');
+      const printWindow = window.open(url, "Print");
       printWindow.addEventListener(
-        'load',
+        "load",
         function () {
           printWindow.print();
           // printWindow.close();
@@ -2491,9 +2573,9 @@ export default {
 
     print_draft_invoice() {
       if (!this.pos_profile.posa_allow_print_draft_invoices) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: __(`You are not allowed to print draft invoices`),
-          color: 'error',
+          color: "error",
         });
         return;
       }
@@ -2524,7 +2606,7 @@ export default {
       this.selcted_delivery_charges = {};
       frappe.call({
         method:
-          'posawesome.posawesome.api.posapp.get_applicable_delivery_charges',
+          "posawesome.posawesome.api.posapp.get_applicable_delivery_charges",
         args: {
           company: this.pos_profile.company,
           pos_profile: this.pos_profile.name,
@@ -2553,102 +2635,104 @@ export default {
   },
 
   mounted() {
-    evntBus.$on('register_pos_profile', (data) => {
+    evntBus.$on("register_pos_profile", (data) => {
       this.pos_profile = data.pos_profile;
       this.customer = data.pos_profile.customer;
       this.pos_opening_shift = data.pos_opening_shift;
       this.stock_settings = data.stock_settings;
       this.float_precision =
-        frappe.defaults.get_default('float_precision') || 2;
+        frappe.defaults.get_default("float_precision") || 2;
       this.currency_precision =
-        frappe.defaults.get_default('currency_precision') || 2;
+        frappe.defaults.get_default("currency_precision") || 2;
       this.invoiceType = this.pos_profile.posa_default_sales_order
-        ? 'Order'
-        : 'Invoice';
+        ? "Order"
+        : "Invoice";
     });
-    evntBus.$on('add_item', (item) => {
+    evntBus.$on("add_item", (item) => {
       this.add_item(item);
     });
-    evntBus.$on('update_customer', (customer) => {
+    evntBus.$on("update_customer", (customer) => {
       this.customer = customer;
     });
-    evntBus.$on('fetch_customer_details', () => {
+    evntBus.$on("fetch_customer_details", () => {
       this.fetch_customer_details();
     });
-    evntBus.$on('new_invoice', () => {
-      this.invoice_doc = '';
+    evntBus.$on("new_invoice", () => {
+      this.invoice_doc = "";
       this.cancel_invoice();
     });
-    evntBus.$on('load_invoice', (data) => {
+    evntBus.$on("load_invoice", (data) => {
       this.new_invoice(data);
-      evntBus.$emit('set_pos_coupons', data.posa_coupons);
+      evntBus.$emit("set_pos_coupons", data.posa_coupons);
     });
-    evntBus.$on('set_offers', (data) => {
+    evntBus.$on("set_offers", (data) => {
       this.posOffers = data;
     });
-    evntBus.$on('update_invoice_offers', (data) => {
+    evntBus.$on("update_invoice_offers", (data) => {
       this.updateInvoiceOffers(data);
     });
-    evntBus.$on('update_invoice_coupons', (data) => {
+    evntBus.$on("update_invoice_coupons", (data) => {
       this.posa_coupons = data;
       this.handelOffers();
     });
-    evntBus.$on('set_all_items', (data) => {
+    evntBus.$on("set_all_items", (data) => {
       this.allItems = data;
       this.items.forEach((item) => {
         this.update_item_detail(item);
       });
     });
-    evntBus.$on('load_return_invoice', (data) => {
+    evntBus.$on("load_return_invoice", (data) => {
       this.new_invoice(data.invoice_doc);
       this.discount_amount = -data.return_doc.discount_amount;
       this.additional_discount_percentage =
         -data.return_doc.additional_discount_percentage;
       this.return_doc = data.return_doc;
     });
-    evntBus.$on('set_new_line', (data) => {
+    evntBus.$on("set_new_line", (data) => {
       this.new_line = data;
     });
-    document.addEventListener('keydown', this.shortOpenPayment.bind(this));
-    document.addEventListener('keydown', this.shortDeleteFirstItem.bind(this));
-    document.addEventListener('keydown', this.shortOpenFirstItem.bind(this));
-    document.addEventListener('keydown', this.shortSelectDiscount.bind(this));
   },
   beforeDestroy() {
-    evntBus.$off('register_pos_profile');
-    evntBus.$off('add_item');
-    evntBus.$off('update_customer');
-    evntBus.$off('fetch_customer_details');
-    evntBus.$off('new_invoice');
-    evntBus.$off('set_offers');
-    evntBus.$off('update_invoice_offers');
-    evntBus.$off('update_invoice_coupons');
-    evntBus.$off('set_all_items');
+    evntBus.$off("register_pos_profile");
+    evntBus.$off("add_item");
+    evntBus.$off("update_customer");
+    evntBus.$off("fetch_customer_details");
+    evntBus.$off("new_invoice");
+    evntBus.$off("set_offers");
+    evntBus.$off("update_invoice_offers");
+    evntBus.$off("update_invoice_coupons");
+    evntBus.$off("set_all_items");
+  },
+  created() {
+    document.addEventListener("keydown", this.shortOpenPayment.bind(this));
+    document.addEventListener("keydown", this.shortDeleteFirstItem.bind(this));
+    document.addEventListener("keydown", this.shortOpenFirstItem.bind(this));
+    document.addEventListener("keydown", this.shortSelectDiscount.bind(this));
   },
   destroyed() {
-    document.removeEventListener('keydown', this.shortOpenPayment);
-    document.removeEventListener('keydown', this.shortDeleteFirstItem);
-    document.removeEventListener('keydown', this.shortOpenFirstItem);
-    document.removeEventListener('keydown', this.shortSelectDiscount);
+    document.removeEventListener("keydown", this.shortOpenPayment);
+    document.removeEventListener("keydown", this.shortDeleteFirstItem);
+    document.removeEventListener("keydown", this.shortOpenFirstItem);
+    document.removeEventListener("keydown", this.shortSelectDiscount);
   },
   watch: {
     customer() {
       this.close_payments();
-      evntBus.$emit('set_customer', this.customer);
+      evntBus.$emit("set_customer", this.customer);
       this.fetch_customer_details();
       this.set_delivery_charges();
     },
     customer_info() {
-      evntBus.$emit('set_customer_info_to_edit', this.customer_info);
+      evntBus.$emit("set_customer_info_to_edit", this.customer_info);
     },
     expanded(data_value) {
-      this.update_items_details(data_value);
+      // this.update_items_details(data_value);
       if (data_value.length > 0) {
         this.update_item_detail(data_value[0]);
       }
     },
     discount_percentage_offer_name() {
-      evntBus.$emit('update_discount_percentage_offer_name', {
+      evntBus.$emit("update_discount_percentage_offer_name", {
         value: this.discount_percentage_offer_name,
       });
     },
@@ -2660,7 +2744,7 @@ export default {
       },
     },
     invoiceType() {
-      evntBus.$emit('update_invoice_type', this.invoiceType);
+      evntBus.$emit("update_invoice_type", this.invoiceType);
     },
     discount_amount() {
       if (!this.discount_amount || this.discount_amount == 0) {
diff --git a/posawesome/public/js/posapp/components/pos/OpeningDialog.vue b/posawesome/public/js/posapp/components/pos/OpeningDialog.vue
index 00cd5aec..d075981f 100644
--- a/posawesome/public/js/posapp/components/pos/OpeningDialog.vue
+++ b/posawesome/public/js/posapp/components/pos/OpeningDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row justify="center">
-    <v-dialog v-model="dialog" persistent max-width="600px">
+    <v-dialog v-model="isOpen" persistent max-width="600px">
       <!-- <template v-slot:activator="{ on, attrs }">
         <v-btn color="primary" dark v-bind="attrs" v-on="on">Open Dialog</v-btn>
       </template>-->
@@ -15,7 +15,7 @@
             <v-row>
               <v-col cols="12">
                 <v-autocomplete
-                  :items="companys"
+                  :items="companies"
                   :label="frappe._('Company')"
                   v-model="company"
                   required
@@ -83,37 +83,40 @@ import format from '../../format';
 export default {
   mixins: [format],
   props: ['dialog'],
-  data: () => ({
-    dialog_data: {},
-    is_loading: false,
-    companys: [],
-    company: '',
-    pos_profiles_data: [],
-    pos_profiles: [],
-    pos_profile: '',
-    payments_method_data: [],
-    payments_methods: [],
-    payments_methods_headers: [
-      {
-        text: __('Mode of Payment'),
-        align: 'start',
-        sortable: false,
-        value: 'mode_of_payment',
-      },
-      {
-        text: __('Opening Amount'),
-        value: 'amount',
-        align: 'center',
-        sortable: false,
-      },
-    ],
-    itemsPerPage: 100,
-    max25chars: (v) => v.length <= 12 || 'Input too long!', // TODO : should validate as number
-    pagination: {},
-    snack: false, // TODO : need to remove
-    snackColor: '', // TODO : need to remove
-    snackText: '', // TODO : need to remove
-  }),
+  data() {
+    return {
+      isOpen: this.dialog ? this.dialog : false,
+      dialog_data: {},
+      is_loading: false,
+      companies: [],
+      company: '',
+      pos_profiles_data: [],
+      pos_profiles: [],
+      pos_profile: '',
+      payments_method_data: [],
+      payments_methods: [],
+      payments_methods_headers: [
+        {
+          text: __('Mode of Payment'),
+          align: 'start',
+          sortable: false,
+          value: 'mode_of_payment',
+        },
+        {
+          text: __('Opening Amount'),
+          value: 'amount',
+          align: 'center',
+          sortable: false,
+        },
+      ],
+      itemsPerPage: 100,
+      max25chars: (v) => v.length <= 12 || 'Input too long!', // TODO : should validate as number
+      pagination: {},
+      snack: false, // TODO : need to remove
+      snackColor: '', // TODO : need to remove
+      snackText: '', // TODO : need to remove
+    };
+  },
   watch: {
     company(val) {
       this.pos_profiles = [];
@@ -152,11 +155,10 @@ export default {
         args: {},
         callback: function (r) {
           if (r.message) {
-            console.info(r.message);
-            r.message.companys.forEach((element) => {
-              vm.companys.push(element.name);
+            r.message.companies.forEach((element) => {
+              vm.companies.push(element.name);
             });
-            vm.company = vm.companys[0];
+            vm.company = vm.companies[0];
             vm.pos_profiles_data = r.message.pos_profiles_data;
             vm.payments_method_data = r.message.payments_method;
           }
diff --git a/posawesome/public/js/posapp/components/pos/Payments.vue b/posawesome/public/js/posapp/components/pos/Payments.vue
index 6c209469..f3c2c399 100644
--- a/posawesome/public/js/posapp/components/pos/Payments.vue
+++ b/posawesome/public/js/posapp/components/pos/Payments.vue
@@ -147,7 +147,7 @@
                     (payment.amount = flt(payment.amount, 0))
                 "
               >
-                {{ __('Request') }}
+                {{ __("Request") }}
               </v-btn>
             </v-col>
           </v-row>
@@ -635,7 +635,7 @@
             dark
             @click="submit"
             :disabled="vaildatPayment"
-            >{{ __('Submit') }}</v-btn
+            >{{ __("Submit") }}</v-btn
           >
         </v-col>
         <v-col cols="6" class="pl-1">
@@ -646,7 +646,7 @@
             dark
             @click="submit(undefined, false, true)"
             :disabled="vaildatPayment"
-            >{{ __('Submit & Print') }}</v-btn
+            >{{ __("Submit & Print") }}</v-btn
           >
         </v-col>
         <v-col cols="12">
@@ -657,7 +657,7 @@
             color="error"
             dark
             @click="back_to_invoice"
-            >{{ __('Cancel Payment') }}</v-btn
+            >{{ __("Cancel Payment") }}</v-btn
           >
         </v-col>
       </v-row>
@@ -667,7 +667,7 @@
         <v-card>
           <v-card-title>
             <span class="headline primary--text">{{
-              __('Confirm Mobile Number')
+              __("Confirm Mobile Number")
             }}</span>
           </v-card-title>
           <v-card-text class="pa-0">
@@ -687,10 +687,10 @@
           <v-card-actions>
             <v-spacer></v-spacer>
             <v-btn color="error" dark @click="phone_dialog = false">{{
-              __('Close')
+              __("Close")
             }}</v-btn>
             <v-btn color="primary" dark @click="request_payment">{{
-              __('Request')
+              __("Request")
             }}</v-btn>
           </v-card-actions>
         </v-card>
@@ -700,14 +700,14 @@
 </template>
 
 <script>
-import { evntBus } from '../../bus';
-import format from '../../format';
+import { evntBus } from "../../bus";
+import format from "../../format";
 export default {
   mixins: [format],
   data: () => ({
     loading: false,
-    pos_profile: '',
-    invoice_doc: '',
+    pos_profile: "",
+    invoice_doc: "",
     loyalty_amount: 0,
     is_credit_sale: 0,
     is_write_off_change: 0,
@@ -715,7 +715,7 @@ export default {
     po_date_menu: false,
     addresses: [],
     sales_persons: [],
-    sales_person: '',
+    sales_person: "",
     paid_change: 0,
     order_delivery_date: false,
     paid_change_rules: [],
@@ -724,24 +724,24 @@ export default {
     redeem_customer_credit: false,
     customer_credit_dict: [],
     phone_dialog: false,
-    invoiceType: 'Invoice',
-    pos_settings: '',
-    customer_info: '',
+    invoiceType: "Invoice",
+    pos_settings: "",
+    customer_info: "",
     mpesa_modes: [],
   }),
 
   methods: {
     back_to_invoice() {
-      evntBus.$emit('show_payment', 'false');
-      evntBus.$emit('set_customer_readonly', false);
+      evntBus.$emit("show_payment", "false");
+      evntBus.$emit("set_customer_readonly", false);
     },
     submit(event, payment_received = false, print = false) {
       if (!this.invoice_doc.is_return && this.total_payments < 0) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `Payments not correct`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
       // validate phone payment
@@ -749,21 +749,21 @@ export default {
       if (!payment_received) {
         this.invoice_doc.payments.forEach((payment) => {
           if (
-            payment.type == 'Phone' &&
-            ![0, '0', '', null, undefined].includes(payment.amount)
+            payment.type == "Phone" &&
+            ![0, "0", "", null, undefined].includes(payment.amount)
           ) {
             phone_payment_is_valid = false;
           }
         });
         if (!phone_payment_is_valid) {
-          evntBus.$emit('show_mesage', {
+          evntBus.$emit("show_mesage", {
             text: __(
-              'Please request phone payment or use other payment method'
+              "Please request phone payment or use other payment method"
             ),
-            color: 'error',
+            color: "error",
           });
-          frappe.utils.play_sound('error');
-          console.error('phone payment not requested');
+          frappe.utils.play_sound("error");
+          console.error("phone payment not requested");
           return;
         }
       }
@@ -773,11 +773,11 @@ export default {
         this.total_payments <
           (this.invoice_doc.rounded_total || this.invoice_doc.grand_total)
       ) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `The amount paid is not complete`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
@@ -786,22 +786,22 @@ export default {
         !this.pos_profile.posa_allow_credit_sale &&
         this.total_payments == 0
       ) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `Please enter the amount paid`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
       if (!this.paid_change) this.paid_change = 0;
 
       if (this.paid_change > -this.diff_payment) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `Paid change can not be greater than total change!`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
@@ -810,11 +810,11 @@ export default {
       );
 
       if (this.is_cashback && total_change != -this.diff_payment) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `Error in change calculations!`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
@@ -825,11 +825,11 @@ export default {
       });
 
       if (credit_calc_check.length > 0) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `redeamed credit can not greater than its total.`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
@@ -838,11 +838,11 @@ export default {
         this.redeemed_customer_credit >
           (this.invoice_doc.rounded_total || this.invoice_doc.grand_total)
       ) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `can not redeam customer credit more than invoice total`,
-          color: 'error',
+          color: "error",
         });
-        frappe.utils.play_sound('error');
+        frappe.utils.play_sound("error");
         return;
       }
 
@@ -850,31 +850,38 @@ export default {
       this.customer_credit_dict = [];
       this.redeem_customer_credit = false;
       this.is_cashback = true;
-      this.sales_person = '';
+      this.sales_person = "";
 
-      evntBus.$emit('new_invoice', 'false');
+      evntBus.$emit("new_invoice", "false");
       this.back_to_invoice();
     },
     submit_invoice(print) {
+      let totalPayedAmount = 0;
       this.invoice_doc.payments.forEach((payment) => {
         payment.amount = flt(payment.amount);
+        totalPayedAmount += payment.amount;
       });
+      if (this.invoice_doc.is_return && totalPayedAmount == 0) {
+        this.invoice_doc.is_pos = 0;
+      }
       if (this.customer_credit_dict.length) {
         this.customer_credit_dict.forEach((row) => {
           row.credit_to_redeem = flt(row.credit_to_redeem);
         });
       }
       let data = {};
-      data['total_change'] = -this.diff_payment;
-      data['paid_change'] = this.paid_change;
-      data['credit_change'] = -this.credit_change;
-      data['redeemed_customer_credit'] = this.redeemed_customer_credit;
-      data['customer_credit_dict'] = this.customer_credit_dict;
-      data['is_cashback'] = this.is_cashback;
+      data["total_change"] = !this.invoice_doc.is_return
+        ? -this.diff_payment
+        : 0;
+      data["paid_change"] = !this.invoice_doc.is_return ? this.paid_change : 0;
+      data["credit_change"] = -this.credit_change;
+      data["redeemed_customer_credit"] = this.redeemed_customer_credit;
+      data["customer_credit_dict"] = this.customer_credit_dict;
+      data["is_cashback"] = this.is_cashback;
 
       const vm = this;
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.submit_invoice',
+        method: "posawesome.posawesome.api.posapp.submit_invoice",
         args: {
           data: data,
           invoice: this.invoice_doc,
@@ -885,12 +892,12 @@ export default {
             if (print) {
               vm.load_print_page();
             }
-            evntBus.$emit('set_last_invoice', vm.invoice_doc.name);
-            evntBus.$emit('show_mesage', {
+            evntBus.$emit("set_last_invoice", vm.invoice_doc.name);
+            evntBus.$emit("show_mesage", {
               text: `Invoice ${r.message.name} is Submited`,
-              color: 'success',
+              color: "success",
             });
-            frappe.utils.play_sound('submit');
+            frappe.utils.play_sound("submit");
             this.addresses = [];
           }
         },
@@ -927,16 +934,16 @@ export default {
       const letter_head = this.pos_profile.letter_head || 0;
       const url =
         frappe.urllib.get_base_url() +
-        '/printview?doctype=Sales%20Invoice&name=' +
+        "/printview?doctype=Sales%20Invoice&name=" +
         this.invoice_doc.name +
-        '&trigger_print=1' +
-        '&format=' +
+        "&trigger_print=1" +
+        "&format=" +
         print_format +
-        '&no_letterhead=' +
+        "&no_letterhead=" +
         letter_head;
-      const printWindow = window.open(url, 'Print');
+      const printWindow = window.open(url, "Print");
       printWindow.addEventListener(
-        'load',
+        "load",
         function () {
           printWindow.print();
           // printWindow.close();
@@ -956,7 +963,7 @@ export default {
       }
     },
     shortPay(e) {
-      if (e.key === 'x' && (e.ctrlKey || e.metaKey)) {
+      if (e.key === "x" && (e.ctrlKey || e.metaKey)) {
         e.preventDefault();
         this.submit();
       }
@@ -968,7 +975,7 @@ export default {
       let change = -this.diff_payment;
       if (this.paid_change > change) {
         this.paid_change_rules = [
-          'Paid change can not be greater than total change!',
+          "Paid change can not be greater than total change!",
         ];
         this.credit_change = 0;
       }
@@ -977,13 +984,31 @@ export default {
       this.clear_all_amounts();
       if (e) {
         frappe
-          .call('posawesome.posawesome.api.posapp.get_available_credit', {
+          .call("posawesome.posawesome.api.posapp.get_available_credit", {
             customer: this.invoice_doc.customer,
             company: this.pos_profile.company,
           })
           .then((r) => {
             const data = r.message;
             if (data.length) {
+              const amount =
+                this.invoice_doc.rounded_total || this.invoice_doc.grand_total;
+              let remainAmount = amount;
+
+              data.forEach((row) => {
+                if (remainAmount > 0) {
+                  if (remainAmount >= row.total_credit) {
+                    row.credit_to_redeem = row.total_credit;
+                    remainAmount = remainAmount - row.total_credit;
+                  } else {
+                    row.credit_to_redeem = remainAmount;
+                    remainAmount = 0;
+                  }
+                } else {
+                  row.credit_to_redeem = 0;
+                }
+              });
+
               this.customer_credit_dict = data;
             } else {
               this.customer_credit_dict = [];
@@ -999,7 +1024,7 @@ export default {
         return;
       }
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_customer_addresses',
+        method: "posawesome.posawesome.api.posapp.get_customer_addresses",
         args: { customer: vm.invoice_doc.customer },
         async: true,
         callback: function (r) {
@@ -1014,14 +1039,14 @@ export default {
     addressFilter(item, queryText, itemText) {
       const textOne = item.address_title
         ? item.address_title.toLowerCase()
-        : '';
+        : "";
       const textTwo = item.address_line1
         ? item.address_line1.toLowerCase()
-        : '';
+        : "";
       const textThree = item.address_line2
         ? item.address_line2.toLowerCase()
-        : '';
-      const textFour = item.city ? item.city.toLowerCase() : '';
+        : "";
+      const textFour = item.city ? item.city.toLowerCase() : "";
       const textFifth = item.name.toLowerCase();
       const searchText = queryText.toLowerCase();
       return (
@@ -1033,7 +1058,7 @@ export default {
       );
     },
     new_address() {
-      evntBus.$emit('open_new_address', this.invoice_doc.customer);
+      evntBus.$emit("open_new_address", this.invoice_doc.customer);
     },
     get_sales_person_names() {
       const vm = this;
@@ -1042,18 +1067,18 @@ export default {
         localStorage.sales_persons_storage
       ) {
         vm.sales_persons = JSON.parse(
-          localStorage.getItem('sales_persons_storage')
+          localStorage.getItem("sales_persons_storage")
         );
       }
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_sales_person_names',
+        method: "posawesome.posawesome.api.posapp.get_sales_person_names",
         callback: function (r) {
           if (r.message) {
             vm.sales_persons = r.message;
             if (vm.pos_profile.posa_local_storage) {
-              localStorage.setItem('sales_persons_storage', '');
+              localStorage.setItem("sales_persons_storage", "");
               localStorage.setItem(
-                'sales_persons_storage',
+                "sales_persons_storage",
                 JSON.stringify(r.message)
               );
             }
@@ -1064,7 +1089,7 @@ export default {
     salesPersonFilter(item, queryText, itemText) {
       const textOne = item.sales_person_name
         ? item.sales_person_name.toLowerCase()
-        : '';
+        : "";
       const textTwo = item.name.toLowerCase();
       const searchText = queryText.toLowerCase();
 
@@ -1076,31 +1101,31 @@ export default {
       this.phone_dialog = false;
       const vm = this;
       if (!this.invoice_doc.contact_mobile) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: __(`Pleas Set Customer Mobile Number`),
-          color: 'error',
+          color: "error",
         });
-        evntBus.$emit('open_edit_customer');
+        evntBus.$emit("open_edit_customer");
         this.back_to_invoice();
         return;
       }
-      evntBus.$emit('freeze', {
+      evntBus.$emit("freeze", {
         title: __(`Waiting for payment... `),
       });
       this.invoice_doc.payments.forEach((payment) => {
         payment.amount = flt(payment.amount);
       });
       let formData = { ...this.invoice_doc };
-      formData['total_change'] = -this.diff_payment;
-      formData['paid_change'] = this.paid_change;
-      formData['credit_change'] = -this.credit_change;
-      formData['redeemed_customer_credit'] = this.redeemed_customer_credit;
-      formData['customer_credit_dict'] = this.customer_credit_dict;
-      formData['is_cashback'] = this.is_cashback;
+      formData["total_change"] = -this.diff_payment;
+      formData["paid_change"] = this.paid_change;
+      formData["credit_change"] = -this.credit_change;
+      formData["redeemed_customer_credit"] = this.redeemed_customer_credit;
+      formData["customer_credit_dict"] = this.customer_credit_dict;
+      formData["is_cashback"] = this.is_cashback;
 
       frappe
         .call({
-          method: 'posawesome.posawesome.api.posapp.update_invoice',
+          method: "posawesome.posawesome.api.posapp.update_invoice",
           args: {
             data: formData,
           },
@@ -1114,49 +1139,49 @@ export default {
         .then(() => {
           frappe
             .call({
-              method: 'posawesome.posawesome.api.posapp.create_payment_request',
+              method: "posawesome.posawesome.api.posapp.create_payment_request",
               args: {
                 doc: vm.invoice_doc,
               },
             })
             .fail(() => {
-              evntBus.$emit('unfreeze');
-              evntBus.$emit('show_mesage', {
+              evntBus.$emit("unfreeze");
+              evntBus.$emit("show_mesage", {
                 text: __(`Payment request failed`),
-                color: 'error',
+                color: "error",
               });
             })
             .then(({ message }) => {
               const payment_request_name = message.name;
               setTimeout(() => {
                 frappe.db
-                  .get_value('Payment Request', payment_request_name, [
-                    'status',
-                    'grand_total',
+                  .get_value("Payment Request", payment_request_name, [
+                    "status",
+                    "grand_total",
                   ])
                   .then(({ message }) => {
-                    if (message.status != 'Paid') {
-                      evntBus.$emit('unfreeze');
-                      evntBus.$emit('show_mesage', {
+                    if (message.status != "Paid") {
+                      evntBus.$emit("unfreeze");
+                      evntBus.$emit("show_mesage", {
                         text: __(
                           `Payment Request took too long to respond. Please try requesting for payment again`
                         ),
-                        color: 'error',
+                        color: "error",
                       });
                     } else {
-                      evntBus.$emit('unfreeze');
-                      evntBus.$emit('show_mesage', {
-                        text: __('Payment of {0} received successfully.', [
+                      evntBus.$emit("unfreeze");
+                      evntBus.$emit("show_mesage", {
+                        text: __("Payment of {0} received successfully.", [
                           vm.formtCurrency(
                             message.grand_total,
                             vm.invoice_doc.currency,
                             0
                           ),
                         ]),
-                        color: 'success',
+                        color: "success",
                       });
                       frappe.db
-                        .get_doc('Sales Invoice', vm.invoice_doc.name)
+                        .get_doc("Sales Invoice", vm.invoice_doc.name)
                         .then((doc) => {
                           vm.invoice_doc = doc;
                           vm.submit(null, true);
@@ -1170,7 +1195,7 @@ export default {
     get_mpesa_modes() {
       const vm = this;
       frappe.call({
-        method: 'posawesome.posawesome.api.m_pesa.get_mpesa_mode_of_payment',
+        method: "posawesome.posawesome.api.m_pesa.get_mpesa_mode_of_payment",
         args: { company: vm.pos_profile.company },
         async: true,
         callback: function (r) {
@@ -1185,7 +1210,7 @@ export default {
     is_mpesa_c2b_payment(payment) {
       if (
         this.mpesa_modes.includes(payment.mode_of_payment) &&
-        payment.type == 'Bank'
+        payment.type == "Bank"
       ) {
         payment.amount = 0;
         return true;
@@ -1199,13 +1224,13 @@ export default {
         mode_of_payment: payment.mode_of_payment,
         customer: this.invoice_doc.customer,
       };
-      evntBus.$emit('open_mpesa_payments', data);
+      evntBus.$emit("open_mpesa_payments", data);
     },
     set_mpesa_payment(payment) {
       this.pos_profile.use_customer_credit = 1;
       this.redeem_customer_credit = true;
       const advance = {
-        type: 'Advance',
+        type: "Advance",
         credit_origin: payment.name,
         total_credit: flt(payment.unallocated_amount),
         credit_to_redeem: flt(payment.unallocated_amount),
@@ -1245,7 +1270,7 @@ export default {
       return this.flt(this.paid_change - change, this.currency_precision);
     },
     diff_lable() {
-      let lable = this.diff_payment < 0 ? 'Change' : 'To Be Paid';
+      let lable = this.diff_payment < 0 ? "Change" : "To Be Paid";
       return lable;
     },
     available_pioints_amount() {
@@ -1277,7 +1302,7 @@ export default {
     vaildatPayment() {
       if (this.pos_profile.posa_allow_sales_order) {
         if (
-          this.invoiceType == 'Order' &&
+          this.invoiceType == "Order" &&
           !this.invoice_doc.posa_delivery_date
         ) {
           return true;
@@ -1295,8 +1320,8 @@ export default {
       } else {
         this.pos_settings.invoice_fields.forEach((el) => {
           if (
-            el.fieldtype == 'Button' &&
-            el.fieldname == 'request_for_payment'
+            el.fieldtype == "Button" &&
+            el.fieldname == "request_for_payment"
           ) {
             res = true;
           }
@@ -1308,72 +1333,81 @@ export default {
 
   mounted: function () {
     this.$nextTick(function () {
-      evntBus.$on('send_invoice_doc_payment', (invoice_doc) => {
+      evntBus.$on("send_invoice_doc_payment", (invoice_doc) => {
         this.invoice_doc = invoice_doc;
         const default_payment = this.invoice_doc.payments.find(
           (payment) => payment.default == 1
         );
         this.is_credit_sale = 0;
         this.is_write_off_change = 0;
-        if (default_payment) {
+        if (default_payment && !invoice_doc.is_return) {
           default_payment.amount = this.flt(
             invoice_doc.rounded_total || invoice_doc.grand_total,
             this.currency_precision
           );
         }
+        if (invoice_doc.is_return) {
+          this.is_return = true;
+          invoice_doc.payments.forEach((payment) => {
+            payment.amount = 0;
+            payment.base_amount = 0;
+          });
+        }
         this.loyalty_amount = 0;
         this.get_addresses();
         this.get_sales_person_names();
       });
-      evntBus.$on('register_pos_profile', (data) => {
+      evntBus.$on("register_pos_profile", (data) => {
         this.pos_profile = data.pos_profile;
         this.get_mpesa_modes();
       });
-      evntBus.$on('add_the_new_address', (data) => {
+      evntBus.$on("add_the_new_address", (data) => {
         this.addresses.push(data);
         this.$forceUpdate();
       });
-      evntBus.$on('update_invoice_type', (data) => {
+      evntBus.$on("update_invoice_type", (data) => {
         this.invoiceType = data;
-        if (this.invoice_doc && data != 'Order') {
+        if (this.invoice_doc && data != "Order") {
           this.invoice_doc.posa_delivery_date = null;
           this.invoice_doc.posa_notes = null;
           this.invoice_doc.shipping_address_name = null;
         }
       });
     });
-    evntBus.$on('update_customer', (customer) => {
+    evntBus.$on("update_customer", (customer) => {
       if (this.customer != customer) {
         this.customer_credit_dict = [];
         this.redeem_customer_credit = false;
         this.is_cashback = true;
       }
     });
-    evntBus.$on('set_pos_settings', (data) => {
+    evntBus.$on("set_pos_settings", (data) => {
       this.pos_settings = data;
     });
-    evntBus.$on('set_customer_info_to_edit', (data) => {
+    evntBus.$on("set_customer_info_to_edit", (data) => {
       this.customer_info = data;
     });
-    evntBus.$on('set_mpesa_payment', (data) => {
+    evntBus.$on("set_mpesa_payment", (data) => {
       this.set_mpesa_payment(data);
     });
-    document.addEventListener('keydown', this.shortPay.bind(this));
+  },
+  created() {
+    document.addEventListener("keydown", this.shortPay.bind(this));
   },
   beforeDestroy() {
-    evntBus.$off('send_invoice_doc_payment');
-    evntBus.$off('register_pos_profile');
-    evntBus.$off('add_the_new_address');
-    evntBus.$off('update_invoice_type');
-    evntBus.$off('update_customer');
-    evntBus.$off('set_pos_settings');
-    evntBus.$off('set_customer_info_to_edit');
-    evntBus.$off('update_invoice_coupons');
-    evntBus.$off('set_mpesa_payment');
+    evntBus.$off("send_invoice_doc_payment");
+    evntBus.$off("register_pos_profile");
+    evntBus.$off("add_the_new_address");
+    evntBus.$off("update_invoice_type");
+    evntBus.$off("update_customer");
+    evntBus.$off("set_pos_settings");
+    evntBus.$off("set_customer_info_to_edit");
+    evntBus.$off("update_invoice_coupons");
+    evntBus.$off("set_mpesa_payment");
   },
 
   destroyed() {
-    document.removeEventListener('keydown', this.shortPay);
+    document.removeEventListener("keydown", this.shortPay);
   },
 
   watch: {
@@ -1382,9 +1416,9 @@ export default {
         this.invoice_doc.loyalty_amount = 0;
         this.invoice_doc.redeem_loyalty_points = 0;
         this.invoice_doc.loyalty_points = 0;
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `Loyalty Amount can not be more then ${this.available_pioints_amount}`,
-          color: 'error',
+          color: "error",
         });
       } else {
         this.invoice_doc.loyalty_amount = this.flt(this.loyalty_amount);
@@ -1412,9 +1446,9 @@ export default {
     },
     redeemed_customer_credit(value) {
       if (value > this.available_customer_credit) {
-        evntBus.$emit('show_mesage', {
+        evntBus.$emit("show_mesage", {
           text: `You can redeem customer credit upto ${this.available_customer_credit}`,
-          color: 'error',
+          color: "error",
         });
       }
     },