From 2a449725b614c5ac5b95c38d309c7e5015997ef0 Mon Sep 17 00:00:00 2001
From: Gadha2311 <gadhavenu2311@gmail.com>
Date: Mon, 12 Jan 2026 11:47:40 +0530
Subject: [PATCH 1/3] fix: add loyaltypoint in salesinvoice

---
 models/baseModels/Invoice/Invoice.ts | 17 +++++++++++++++++
 schemas/app/ERPNextSyncSettings.json |  3 ++-
 schemas/app/SalesInvoice.json        |  7 +++++++
 schemas/types.ts                     |  5 +++--
 src/components/Controls/Button.vue   |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index cacb4e0b..f8ae5765 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -94,6 +94,7 @@ export abstract class Invoice extends Transactional {
   discountAmount?: Money;
   discountPercent?: number;
   loyaltyPoints?: number;
+  availableLoyaltyPoints?: number;
   discountAfterTax?: boolean;
   stockNotTransferred?: number;
   loyaltyProgram?: string;
@@ -992,6 +993,21 @@ export abstract class Invoice extends Transactional {
       },
       dependsOn: ['party', 'name'],
     },
+    availableLoyaltyPoints: {
+      formula: async () => {
+        if (!this.party) {
+          return 0;
+        }
+
+        const partyDoc = (await this.fyo.doc.getDoc(
+          ModelNameEnum.Party,
+          this.party
+        )) as Party;
+
+        return partyDoc?.loyaltyPoints || 0;
+      },
+      dependsOn: ['party'],
+    },
     currency: {
       formula: async () => {
         const currency = (await this.fyo.getValue(
@@ -1181,6 +1197,7 @@ export abstract class Invoice extends Transactional {
     backReference: () => !this.backReference,
     quote: () => !this.quote,
     loyaltyProgram: () => !this.loyaltyProgram,
+    availableLoyaltyPoints: () => !this.loyaltyProgram || this.isReturn,
     loyaltyPoints: () => !this.redeemLoyaltyPoints || this.isReturn,
     redeemLoyaltyPoints: () => !this.loyaltyProgram || this.isReturn,
     coupons: () => this.isSubmitted && !this.coupons?.length,
diff --git a/schemas/app/ERPNextSyncSettings.json b/schemas/app/ERPNextSyncSettings.json
index 2913dc7e..9e629071 100644
--- a/schemas/app/ERPNextSyncSettings.json
+++ b/schemas/app/ERPNextSyncSettings.json
@@ -49,7 +49,8 @@
       "label": "Sync Data From Server",
       "fieldname": "syncDataFromServer",
       "fieldtype": "Button",
-      "section": "Default"
+      "section": "Default",
+      "bold": true
     },
     {
       "label": "Register Instance",
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 2086377f..f372a543 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -85,6 +85,13 @@
       "section": "References",
       "readOnly": true
     },
+    {
+      "fieldname": "availableLoyaltyPoints",
+      "fieldtype": "Int",
+      "label": "Available Loyalty Points",
+      "readOnly": true,
+      "section": "References"
+    },
     {
       "fieldname": "redeemLoyaltyPoints",
       "fieldtype": "Check",
diff --git a/schemas/types.ts b/schemas/types.ts
index 4fbbb9b5..552f8c18 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -67,10 +67,11 @@ export interface BaseField {
   computed?: boolean;            // Computed values are not stored in the database.
   section?: string;              // UI Facing config, for grouping by sections
   tab?: string;                  // UI Facing config, for grouping by tabs
-  abstract?: string;             // Used to mark the location of a field in an Abstract schema 
+  abstract?: string;             // Used to mark the location of a field in an Abstract schema
   isCustom?: boolean;            // Whether the field is a custom field
+  bold?: boolean;                // UI Facing config, whether to make the label bold
   filters?: Record<string, string>;
-  getOptions?: () => Promise<{ label: string; value: string }[]>; 
+  getOptions?: () => Promise<{ label: string; value: string }[]>;
 }
 
 export type SelectOption = { value: string; label: string };
diff --git a/src/components/Controls/Button.vue b/src/components/Controls/Button.vue
index f95bef29..3aef30e6 100644
--- a/src/components/Controls/Button.vue
+++ b/src/components/Controls/Button.vue
@@ -13,7 +13,7 @@
   >
     <label class="flex items-center justify-between w-full">
       <div v-if="showLabel && !labelRight" :class="labelClasses">
-        {{ df.label }}
+        <span :class="{ 'font-bold': df.bold }">{{ df.label }}</span>
       </div>
       <button
         :class="['flex items-center justify-center']"

From 4731d5601bb3d3b343776927fd595a13919e956d Mon Sep 17 00:00:00 2001
From: Gadha2311 <gadhavenu2311@gmail.com>
Date: Wed, 14 Jan 2026 15:22:42 +0530
Subject: [PATCH 2/3] fix: improve ERPNext sync button styles

---
 .../ERPNextSyncSettings.ts                    |  6 ++++-
 models/baseModels/Invoice/Invoice.ts          | 10 ++++----
 schemas/app/ERPNextSyncSettings.json          |  9 +++++--
 src/components/Controls/Button.vue            | 24 ++++++++++++-------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/models/baseModels/ERPNextSyncSettings/ERPNextSyncSettings.ts b/models/baseModels/ERPNextSyncSettings/ERPNextSyncSettings.ts
index 96aa4844..b1899350 100644
--- a/models/baseModels/ERPNextSyncSettings/ERPNextSyncSettings.ts
+++ b/models/baseModels/ERPNextSyncSettings/ERPNextSyncSettings.ts
@@ -1,6 +1,6 @@
 import { Doc } from 'fyo/model/doc';
 import { ChangeArg, HiddenMap } from 'fyo/model/types';
-import { initERPNSync } from 'src/utils/erpnextSync';
+import { initERPNSync, syncDocumentsToERPNext } from 'src/utils/erpnextSync';
 
 export class ERPNextSyncSettings extends Doc {
   deviceID?: string;
@@ -12,6 +12,7 @@ export class ERPNextSyncSettings extends Doc {
 
   dataSyncInterval?: string;
   syncDataFromServer?: boolean;
+  syncDataToServer?: boolean;
 
   registerInstance?: string;
   syncSettings?: string;
@@ -44,6 +45,9 @@ export class ERPNextSyncSettings extends Doc {
     if (ch.changed === 'syncDataFromServer') {
       await initERPNSync(this.fyo);
       ipc.reloadWindow();
+    } else if (ch.changed === 'syncDataToServer') {
+      await syncDocumentsToERPNext(this.fyo);
+      ipc.reloadWindow();
     }
   }
 }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index f8ae5765..2fa9b2d5 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -999,12 +999,12 @@ export abstract class Invoice extends Transactional {
           return 0;
         }
 
-        const partyDoc = (await this.fyo.doc.getDoc(
+        const loyaltyPoints = await this.fyo.getValue(
           ModelNameEnum.Party,
-          this.party
-        )) as Party;
-
-        return partyDoc?.loyaltyPoints || 0;
+          this.party,
+          'loyaltyPoints'
+        );
+        return loyaltyPoints || 0;
       },
       dependsOn: ['party'],
     },
diff --git a/schemas/app/ERPNextSyncSettings.json b/schemas/app/ERPNextSyncSettings.json
index 9e629071..ed22c91c 100644
--- a/schemas/app/ERPNextSyncSettings.json
+++ b/schemas/app/ERPNextSyncSettings.json
@@ -49,8 +49,13 @@
       "label": "Sync Data From Server",
       "fieldname": "syncDataFromServer",
       "fieldtype": "Button",
-      "section": "Default",
-      "bold": true
+      "section": "Default"
+    },
+    {
+      "label": "Sync Data To Server",
+      "fieldname": "syncDataToServer",
+      "fieldtype": "Button",
+      "section": "Default"
     },
     {
       "label": "Register Instance",
diff --git a/src/components/Controls/Button.vue b/src/components/Controls/Button.vue
index 3aef30e6..7c697c60 100644
--- a/src/components/Controls/Button.vue
+++ b/src/components/Controls/Button.vue
@@ -3,7 +3,6 @@
     :class="[containerClasses]"
     class="
       mt-6
-      p-2
       w-full
       text-gray-900
       dark:text-gray-100
@@ -11,16 +10,25 @@
       focus:outline-none
     "
   >
-    <label class="flex items-center justify-between w-full">
-      <div v-if="showLabel && !labelRight" :class="labelClasses">
-        <span :class="{ 'font-bold': df.bold }">{{ df.label }}</span>
-      </div>
+    <label class="flex w-full">
       <button
-        :class="['flex items-center justify-center']"
+        type="button"
         @click="onClick"
         :disabled="isReadOnly"
-        type="button"
-      ></button>
+        class="
+          w-full
+          flex
+          items-center
+          justify-center
+          p-2
+          rounded-md
+          bg-blue-300
+          hover:bg-blue-400 hover:shadow-md hover:-translate-y-[1px]
+          transition
+        "
+      >
+        {{ df.label }}
+      </button>
     </label>
   </div>
 </template>

From 95c88f77a85b6f9de6c4d9d8c13d47a3fb0953e1 Mon Sep 17 00:00:00 2001
From: Gadha2311 <gadhavenu2311@gmail.com>
Date: Wed, 14 Jan 2026 17:00:27 +0530
Subject: [PATCH 3/3] fix: added loyaltyprogram in POS redeem loyalty

---
 src/pages/POS/LoyaltyProgramModal.vue | 4 +++-
 src/pages/POS/POS.vue                 | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/POS/LoyaltyProgramModal.vue b/src/pages/POS/LoyaltyProgramModal.vue
index afcb3568..a4e921d9 100644
--- a/src/pages/POS/LoyaltyProgramModal.vue
+++ b/src/pages/POS/LoyaltyProgramModal.vue
@@ -17,7 +17,9 @@
         />
       </svg>
 
-      <p class="dark:text-gray-100">{{ loyaltyPoints }}</p>
+      <p class="dark:text-gray-100 pr-6">
+        {{ loyaltyPoints }} - ({{ loyaltyProgram }})
+      </p>
     </div>
 
     <Int
diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
index b2843c42..554104f8 100644
--- a/src/pages/POS/POS.vue
+++ b/src/pages/POS/POS.vue
@@ -20,6 +20,7 @@
       :total-quantity="totalQuantity"
       :item-quantity-qap="itemQtyMap"
       :loyalty-points="loyaltyPoints"
+      :loyalty-program="loyaltyProgram"
       :open-alert-modal="openAlertModal"
       :default-customer="defaultCustomer"
       :item-search-term="itemSearchTerm"
@@ -75,6 +76,7 @@
       :total-quantity="totalQuantity"
       :item-quantity-qap="itemQtyMap"
       :loyalty-points="loyaltyPoints"
+      :loyalty-program="loyaltyProgram"
       :open-alert-modal="openAlertModal"
       :default-customer="defaultCustomer"
       :item-search-term="itemSearchTerm"