mirror of
https://github.com/frappe/books.git
synced 2026-08-24 10:04:45 -05:00
Merge pull request #1474 from Gadha2311/schedular-error
fix: resolved the sheduler error
This commit is contained in:
@@ -26,7 +26,7 @@ export async function initScheduler(interval: string) {
|
||||
},
|
||||
{
|
||||
name: 'checkLoyaltyProgramExpiry',
|
||||
interval: '0 1 * * *',
|
||||
interval: '24 hours',
|
||||
worker: {
|
||||
workerData: {
|
||||
useTsNode: true,
|
||||
|
||||
@@ -41,6 +41,12 @@ export class ERPNextSyncSettings extends Doc {
|
||||
batchSyncType: () => {
|
||||
return !this.fyo.singles.InventorySettings?.enableBatches;
|
||||
},
|
||||
syncDataFromServer: () => {
|
||||
return !this.deviceID;
|
||||
},
|
||||
syncDataToServer: () => {
|
||||
return !this.deviceID;
|
||||
},
|
||||
};
|
||||
|
||||
async change(ch: ChangeArg) {
|
||||
|
||||
@@ -462,9 +462,17 @@ export class Payment extends Transactional {
|
||||
|
||||
const previousOutstandingAmount = referenceDoc.outstandingAmount as Money;
|
||||
const isReturnInvoice = (referenceDoc as Invoice).isReturn;
|
||||
const outstandingAmount = isReturnInvoice
|
||||
? previousOutstandingAmount.add(row.amount!)
|
||||
: previousOutstandingAmount.sub(row.amount!);
|
||||
|
||||
let outstandingAmount: Money;
|
||||
|
||||
if (isReturnInvoice) {
|
||||
const paymentAmount = row.amount!.abs();
|
||||
const previous = previousOutstandingAmount.abs();
|
||||
|
||||
outstandingAmount = previous.sub(paymentAmount);
|
||||
} else {
|
||||
outstandingAmount = previousOutstandingAmount.sub(row.amount!);
|
||||
}
|
||||
await referenceDoc.setAndSync({ outstandingAmount });
|
||||
}
|
||||
}
|
||||
|
||||
+31
@@ -75,6 +75,7 @@ import {
|
||||
updateERPNSyncSettings,
|
||||
} from './utils/erpnextSync';
|
||||
import { ERPNextSyncSettings } from 'models/baseModels/ERPNextSyncSettings/ERPNextSyncSettings';
|
||||
import { ErrorLogEnum } from 'fyo/telemetry/types';
|
||||
|
||||
enum Screen {
|
||||
Desk = 'Desk',
|
||||
@@ -247,6 +248,36 @@ export default defineComponent({
|
||||
`${fyo.singles.ERPNextSyncSettings?.dataSyncInterval as string}m`
|
||||
);
|
||||
} catch (error) {
|
||||
const errorMessage =
|
||||
error instanceof Error ? error.message : String(error);
|
||||
|
||||
try {
|
||||
const existing = await fyo.db.getAll(
|
||||
ErrorLogEnum.IntegrationErrorLog,
|
||||
{
|
||||
filters: {
|
||||
error: errorMessage,
|
||||
},
|
||||
limit: 1,
|
||||
}
|
||||
);
|
||||
|
||||
if (!existing.length) {
|
||||
await fyo.doc
|
||||
.getNewDoc(ErrorLogEnum.IntegrationErrorLog, {
|
||||
error: errorMessage,
|
||||
data: JSON.stringify({
|
||||
instance: fyo.singles.ERPNextSyncSettings?.deviceID,
|
||||
operation: 'register_instance',
|
||||
trigger: 'showSetupWizardOrDesk',
|
||||
baseURL: baseURL,
|
||||
}),
|
||||
})
|
||||
.sync();
|
||||
}
|
||||
} catch (logError) {
|
||||
throw logError;
|
||||
}
|
||||
showToast({ message: 'Connection Failed', type: 'error' });
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user