{
this.focus();
});
- }
+ },
},
computed: {
formattedValue() {
return frappe.format(this.value, this.df, this.doc);
- }
- }
+ },
+ },
};
From 1e6113e92f925fcaa43d182b7a23231f503303e3 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 27 Dec 2021 17:04:34 +0530
Subject: [PATCH 06/25] fix: update PurchaseInvoice to use pesa
---
.../PurchaseInvoice/PurchaseInvoice.js | 11 ++--
.../PurchaseInvoiceItem.js | 14 ++---
models/doctype/TaxSummary/TaxSummary.js | 14 ++---
.../Transaction/TransactionDocument.js | 63 +++++++++----------
4 files changed, 48 insertions(+), 54 deletions(-)
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoice.js b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
index 957c7d64..bf1c447d 100644
--- a/models/doctype/PurchaseInvoice/PurchaseInvoice.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
@@ -1,5 +1,5 @@
-import { getActions } from '../Transaction/Transaction';
import InvoiceTemplate from '../SalesInvoice/InvoiceTemplate.vue';
+import { getActions } from '../Transaction/Transaction';
import PurchaseInvoice from './PurchaseInvoiceDocument';
export default {
@@ -61,7 +61,8 @@ export default {
fieldname: 'exchangeRate',
label: 'Exchange Rate',
fieldtype: 'Float',
- formula: (doc) => doc.getExchangeRate(),
+ default: 1,
+ formula: async (doc) => await doc.getExchangeRate(),
required: true,
},
{
@@ -75,7 +76,7 @@ export default {
fieldname: 'netTotal',
label: 'Net Total',
fieldtype: 'Currency',
- formula: (doc) => doc.getSum('items', 'amount'),
+ formula: (doc) => doc.getSum('items', 'amount', false),
readOnly: 1,
getCurrency: (doc) => doc.currency,
},
@@ -83,7 +84,7 @@ export default {
fieldname: 'baseNetTotal',
label: 'Net Total (Company Currency)',
fieldtype: 'Currency',
- formula: (doc) => doc.netTotal * doc.exchangeRate,
+ formula: (doc) => doc.netTotal.mul(doc.exchangeRate),
readOnly: 1,
},
{
@@ -106,7 +107,7 @@ export default {
fieldname: 'baseGrandTotal',
label: 'Grand Total (Company Currency)',
fieldtype: 'Currency',
- formula: (doc) => doc.grandTotal * doc.exchangeRate,
+ formula: (doc) => doc.grandTotal.mul(doc.exchangeRate),
readOnly: 1,
},
{
diff --git a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
index 35f8eef0..dfa031e9 100644
--- a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
+++ b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
@@ -32,7 +32,7 @@ export default {
label: 'Quantity',
fieldtype: 'Float',
required: 1,
- formula: () => 1,
+ default: 1,
},
{
fieldname: 'rate',
@@ -40,9 +40,9 @@ export default {
fieldtype: 'Currency',
required: 1,
formula: async (row, doc) => {
- const baseRate = (await doc.getFrom('Item', row.item, 'rate')) || 0;
- const exchangeRate = doc.exchangeRate ?? 1;
- return baseRate / exchangeRate;
+ const baseRate =
+ (await doc.getFrom('Item', row.item, 'rate')) || frappe.pesa(0);
+ return baseRate.div(doc.exchangeRate);
},
getCurrency: (row, doc) => doc.currency,
},
@@ -50,7 +50,7 @@ export default {
fieldname: 'baseRate',
label: 'Rate (Company Currency)',
fieldtype: 'Currency',
- formula: (row, doc) => row.rate * doc.exchangeRate,
+ formula: (row, doc) => row.rate.mul(doc.exchangeRate),
readOnly: 1,
},
{
@@ -76,7 +76,7 @@ export default {
label: 'Amount',
fieldtype: 'Currency',
readOnly: 1,
- formula: (row) => row.quantity * row.rate,
+ formula: (row) => row.rate.mul(row.quantity),
getCurrency: (row, doc) => doc.currency,
},
{
@@ -84,7 +84,7 @@ export default {
label: 'Amount (Company Currency)',
fieldtype: 'Currency',
readOnly: 1,
- formula: (row, doc) => row.amount * doc.exchangeRate,
+ formula: (row, doc) => row.amount.mul(doc.exchangeRate),
},
],
};
diff --git a/models/doctype/TaxSummary/TaxSummary.js b/models/doctype/TaxSummary/TaxSummary.js
index f5d1f7ba..dc130167 100644
--- a/models/doctype/TaxSummary/TaxSummary.js
+++ b/models/doctype/TaxSummary/TaxSummary.js
@@ -8,26 +8,26 @@ export default {
label: 'Tax Account',
fieldtype: 'Link',
target: 'Account',
- required: 1
+ required: 1,
},
{
fieldname: 'rate',
label: 'Rate',
fieldtype: 'Float',
- required: 1
+ required: 1,
},
{
fieldname: 'amount',
label: 'Amount',
fieldtype: 'Currency',
- required: 1
+ required: 1,
},
{
fieldname: 'baseAmount',
label: 'Amount (Company Currency)',
fieldtype: 'Currency',
- formula: (row, doc) => row.amount * doc.exchangeRate,
- readOnly: 1
- }
- ]
+ formula: (row, doc) => row.amount.mul(doc.exchangeRate),
+ readOnly: 1,
+ },
+ ],
};
diff --git a/models/doctype/Transaction/TransactionDocument.js b/models/doctype/Transaction/TransactionDocument.js
index f4fa7bfa..3fc7747a 100644
--- a/models/doctype/Transaction/TransactionDocument.js
+++ b/models/doctype/Transaction/TransactionDocument.js
@@ -1,11 +1,10 @@
-import BaseDocument from 'frappejs/model/document';
import frappe from 'frappejs';
-import { round } from 'frappejs/utils/numberFormat';
+import BaseDocument from 'frappejs/model/document';
import { getExchangeRate } from '../../../accounting/exchangeRate';
export default class TransactionDocument extends BaseDocument {
async getExchangeRate() {
- if (!this.currency) return;
+ if (!this.currency) return 1.0;
let accountingSettings = await frappe.getSingle('AccountingSettings');
const companyCurrency = accountingSettings.currency;
@@ -14,7 +13,7 @@ export default class TransactionDocument extends BaseDocument {
}
return await getExchangeRate({
fromCurrency: this.currency,
- toCurrency: companyCurrency
+ toCurrency: companyCurrency,
});
}
@@ -22,31 +21,30 @@ export default class TransactionDocument extends BaseDocument {
let taxes = {};
for (let row of this.items) {
- if (row.tax) {
- let tax = await this.getTax(row.tax);
- for (let d of tax.details) {
- let amount = (row.amount * d.rate) / 100;
- taxes[d.account] = taxes[d.account] || {
- account: d.account,
- rate: d.rate,
- amount: 0
- };
- // collect amount
- taxes[d.account].amount += amount;
- }
+ if (!row.tax) {
+ continue;
+ }
+
+ const tax = await this.getTax(row.tax);
+ for (let d of tax.details) {
+ taxes[d.account] = taxes[d.account] || {
+ account: d.account,
+ rate: d.rate,
+ amount: frappe.pesa(0),
+ };
+
+ const amount = row.amount.mul(d.rate).div(100);
+ taxes[d.account].amount = taxes[d.account].amount.add(amount);
}
}
- return (
- Object.keys(taxes)
- .map(account => {
- let tax = taxes[account];
- tax.baseAmount = round(tax.amount * this.exchangeRate, 2);
- return tax;
- })
- // clear rows with 0 amount
- .filter(tax => tax.amount)
- );
+ return Object.keys(taxes)
+ .map((account) => {
+ const tax = taxes[account];
+ tax.baseAmount = tax.amount.mul(this.exchangeRate);
+ return tax;
+ })
+ .filter((tax) => !tax.amount.isZero());
}
async getTax(tax) {
@@ -56,13 +54,8 @@ export default class TransactionDocument extends BaseDocument {
}
async getGrandTotal() {
- let grandTotal = this.netTotal;
- if (this.taxes) {
- for (let row of this.taxes) {
- grandTotal += row.amount;
- }
- }
-
- return grandTotal;
+ return (this.taxes || [])
+ .map(({ amount }) => amount)
+ .reduce((a, b) => a.add(b), this.netTotal);
}
-};
+}
From 5c6ac0e16149b078d557ddd7b1e6febf62a6222c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 28 Dec 2021 12:01:42 +0530
Subject: [PATCH 07/25] fix: currency field display (PI)
---
models/doctype/PurchaseInvoice/PurchaseInvoice.js | 4 +++-
src/components/Controls/Currency.vue | 9 +++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoice.js b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
index bf1c447d..1405eaf9 100644
--- a/models/doctype/PurchaseInvoice/PurchaseInvoice.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
@@ -54,7 +54,9 @@ export default {
fieldtype: 'Link',
target: 'Currency',
hidden: 1,
- formula: (doc) => doc.getFrom('Party', doc.supplier, 'currency'),
+ formula: (doc) =>
+ doc.getFrom('Party', doc.supplier, 'currency') ||
+ frappe.AccountingSettings.currency,
formulaDependsOn: ['supplier'],
},
{
diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 9ecb0c23..67e68dfc 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -8,7 +8,7 @@
ref="input"
:class="inputClasses"
:type="inputType"
- :value="value"
+ :value="value.round()"
:placeholder="inputPlaceholder"
:readonly="isReadOnly"
@blur="onBlur"
@@ -49,8 +49,13 @@ export default {
return frappe.pesa(value);
},
onBlur(e) {
+ let { value } = e.target;
+ if (value === '') {
+ value = frappe.pesa(0).round();
+ }
+
this.showInput = false;
- this.triggerChange(e.target.value);
+ this.triggerChange(value);
},
activateInput() {
this.showInput = true;
From c9349b0570db0884eb401039741c1e2eae126665 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 28 Dec 2021 13:35:53 +0530
Subject: [PATCH 08/25] fix: update ledger posting calculations
---
accounting/ledgerPosting.js | 60 ++++++++++++++++---------------------
1 file changed, 25 insertions(+), 35 deletions(-)
diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.js
index 965fe9d0..2febe251 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.js
@@ -1,5 +1,4 @@
import frappe from 'frappejs';
-import { round } from 'frappejs/utils/numberFormat';
export default class LedgerPosting {
constructor({ reference, party, date, description }) {
@@ -16,13 +15,13 @@ export default class LedgerPosting {
async debit(account, amount, referenceType, referenceName) {
const entry = this.getEntry(account, referenceType, referenceName);
- entry.debit += amount;
+ entry.debit = entry.debit.add(amount);
await this.setAccountBalanceChange(account, 'debit', amount);
}
async credit(account, amount, referenceType, referenceName) {
const entry = this.getEntry(account, referenceType, referenceName);
- entry.credit += amount;
+ entry.credit = entry.credit.add(amount);
await this.setAccountBalanceChange(account, 'credit', amount);
}
@@ -30,16 +29,16 @@ export default class LedgerPosting {
const debitAccounts = ['Asset', 'Expense'];
const { rootType } = await frappe.getDoc('Account', accountName);
if (debitAccounts.indexOf(rootType) === -1) {
- const change = type == 'credit' ? amount : -1 * amount;
+ const change = type == 'credit' ? amount : amount.mul(-1);
this.accountEntries.push({
name: accountName,
- balanceChange: change
+ balanceChange: change,
});
} else {
- const change = type == 'debit' ? amount : -1 * amount;
+ const change = type == 'debit' ? amount : amount.mul(-1);
this.accountEntries.push({
name: accountName,
- balanceChange: change
+ balanceChange: change,
});
}
}
@@ -54,8 +53,8 @@ export default class LedgerPosting {
referenceName: referenceName || this.reference.name,
description: this.description,
reverted: this.reverted,
- debit: 0,
- credit: 0
+ debit: frappe.pesa(0),
+ credit: frappe.pesa(0),
};
this.entries.push(entry);
@@ -78,8 +77,8 @@ export default class LedgerPosting {
fields: ['name'],
filters: {
referenceName: this.reference.name,
- reverted: 0
- }
+ reverted: 0,
+ },
});
for (let entry of data) {
@@ -96,24 +95,23 @@ export default class LedgerPosting {
entry.reverted = 1;
}
for (let entry of this.accountEntries) {
- entry.balanceChange = -1 * entry.balanceChange;
+ entry.balanceChange = entry.balanceChange.mul(-1);
}
await this.insertEntries();
}
makeRoundOffEntry() {
let { debit, credit } = this.getTotalDebitAndCredit();
- let precision = this.getPrecision();
- let difference = round(debit - credit, precision);
- let absoluteValue = Math.abs(difference);
+ let difference = debit.sub(credit);
+ let absoluteValue = difference.abs();
let allowance = 0.5;
- if (absoluteValue === 0) {
+ if (absoluteValue.eq(0)) {
return;
}
let roundOffAccount = this.getRoundOffAccount();
- if (absoluteValue <= allowance) {
- if (difference > 0) {
+ if (absoluteValue.lte(allowance)) {
+ if (difference.gt(0)) {
this.credit(roundOffAccount, absoluteValue);
} else {
this.debit(roundOffAccount, absoluteValue);
@@ -123,49 +121,41 @@ export default class LedgerPosting {
validateEntries() {
let { debit, credit } = this.getTotalDebitAndCredit();
- if (debit !== credit) {
+ if (!debit.eq(credit)) {
throw new Error(
- `Total Debit (${debit}) must be equal to Total Credit (${credit})`
+ `Total Debit (${debit.round()}) must be equal to Total Credit (${credit.round()})`
);
}
}
getTotalDebitAndCredit() {
- let debit = 0;
- let credit = 0;
+ let debit = frappe.pesa(0);
+ let credit = frappe.pesa(0);
for (let entry of this.entries) {
- debit += entry.debit;
- credit += entry.credit;
+ debit = debit.add(entry.debit);
+ credit = credit.add(entry.credit);
}
- let precision = this.getPrecision();
- debit = round(debit, precision);
- credit = round(credit, precision);
-
return { debit, credit };
}
async insertEntries() {
for (let entry of this.entries) {
let entryDoc = frappe.newDoc({
- doctype: 'AccountingLedgerEntry'
+ doctype: 'AccountingLedgerEntry',
});
Object.assign(entryDoc, entry);
await entryDoc.insert();
}
for (let entry of this.accountEntries) {
let entryDoc = await frappe.getDoc('Account', entry.name);
- entryDoc.balance += entry.balanceChange;
+ entryDoc.balance = entryDoc.balance.add(entry.balanceChange);
await entryDoc.update();
}
}
- getPrecision() {
- return frappe.SystemSettings.internalPrecision;
- }
-
getRoundOffAccount() {
return frappe.AccountingSettings.roundOffAccount;
}
-};
+}
From 5f4a9ceeb12165ed79972941e71524023e74e670 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 28 Dec 2021 13:45:19 +0530
Subject: [PATCH 09/25] fix: update SalesInvoice
---
models/doctype/SalesInvoice/SalesInvoice.js | 11 +++++++----
.../doctype/SalesInvoiceItem/SalesInvoiceItem.js | 14 +++++++-------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/models/doctype/SalesInvoice/SalesInvoice.js b/models/doctype/SalesInvoice/SalesInvoice.js
index 3612b795..c7631549 100644
--- a/models/doctype/SalesInvoice/SalesInvoice.js
+++ b/models/doctype/SalesInvoice/SalesInvoice.js
@@ -53,13 +53,16 @@ export default {
label: 'Customer Currency',
fieldtype: 'Link',
target: 'Currency',
- formula: (doc) => doc.getFrom('Party', doc.customer, 'currency'),
+ formula: (doc) =>
+ doc.getFrom('Party', doc.customer, 'currency') ||
+ frappe.AccountingSettings.currency,
formulaDependsOn: ['customer'],
},
{
fieldname: 'exchangeRate',
label: 'Exchange Rate',
fieldtype: 'Float',
+ default: 1,
formula: (doc) => doc.getExchangeRate(),
readOnly: true,
},
@@ -74,7 +77,7 @@ export default {
fieldname: 'netTotal',
label: 'Net Total',
fieldtype: 'Currency',
- formula: (doc) => doc.getSum('items', 'amount'),
+ formula: (doc) => doc.getSum('items', 'amount', false),
readOnly: 1,
getCurrency: (doc) => doc.currency,
},
@@ -82,7 +85,7 @@ export default {
fieldname: 'baseNetTotal',
label: 'Net Total (Company Currency)',
fieldtype: 'Currency',
- formula: (doc) => doc.netTotal * doc.exchangeRate,
+ formula: (doc) => doc.netTotal.mul(doc.exchangeRate),
readOnly: 1,
},
{
@@ -105,7 +108,7 @@ export default {
fieldname: 'baseGrandTotal',
label: 'Grand Total (Company Currency)',
fieldtype: 'Currency',
- formula: (doc) => doc.grandTotal * doc.exchangeRate,
+ formula: (doc) => doc.grandTotal.mul(doc.exchangeRate),
readOnly: 1,
},
{
diff --git a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
index 98a36a72..08f2adac 100644
--- a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
+++ b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
@@ -34,7 +34,7 @@ export default {
label: 'Quantity',
fieldtype: 'Float',
required: 1,
- formula: (row) => row.quantity || 1,
+ default: 1,
},
{
fieldname: 'rate',
@@ -42,9 +42,9 @@ export default {
fieldtype: 'Currency',
required: 1,
formula: async (row, doc) => {
- const baseRate = (await doc.getFrom('Item', row.item, 'rate')) || 0;
- const exchangeRate = doc.exchangeRate ?? 1;
- return baseRate / exchangeRate;
+ const baseRate =
+ (await doc.getFrom('Item', row.item, 'rate')) || frappe.pesa(0);
+ return baseRate.div(doc.exchangeRate);
},
getCurrency: (row, doc) => doc.currency,
formulaDependsOn: ['item'],
@@ -53,7 +53,7 @@ export default {
fieldname: 'baseRate',
label: 'Rate (Company Currency)',
fieldtype: 'Currency',
- formula: (row, doc) => row.rate * doc.exchangeRate,
+ formula: (row, doc) => row.rate.mul(doc.exchangeRate),
readOnly: 1,
},
{
@@ -78,7 +78,7 @@ export default {
label: 'Amount',
fieldtype: 'Currency',
readOnly: 1,
- formula: (row) => row.quantity * row.rate,
+ formula: (row) => row.rate.mul(row.quantity),
getCurrency: (row, doc) => doc.currency,
},
{
@@ -86,7 +86,7 @@ export default {
label: 'Amount (Company Currency)',
fieldtype: 'Currency',
readOnly: 1,
- formula: (row, doc) => row.amount * doc.exchangeRate,
+ formula: (row, doc) => row.amount.mul(doc.exchangeRate),
},
],
};
From ed16c47b421cee6aa5475bce591305e1c36e9d58 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 11:31:29 +0530
Subject: [PATCH 10/25] fix: patch 0 for null currency values
---
patches/0.0.4/convertCurrencyToStrings.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/patches/0.0.4/convertCurrencyToStrings.js b/patches/0.0.4/convertCurrencyToStrings.js
index a4a72ca7..84bcd8ac 100644
--- a/patches/0.0.4/convertCurrencyToStrings.js
+++ b/patches/0.0.4/convertCurrencyToStrings.js
@@ -29,10 +29,7 @@ export default async function execute() {
const rows = await frappe.db.knex(name);
const convertedRows = rows.map((row) => {
for (let field of fields) {
- if (row[field] === null) {
- continue;
- }
- row[field] = frappe.pesa(row[field]).store;
+ row[field] = frappe.pesa(row[field] ?? 0).store;
}
return row;
});
From 8583db75d6f257254391b69a64695d55e196dca0 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 11:59:26 +0530
Subject: [PATCH 11/25] fix: update payments to use pesa
---
models/doctype/Payment/Payment.js | 11 ++++---
models/doctype/Payment/PaymentServer.js | 39 ++++++++++++++++---------
models/doctype/PaymentFor/PaymentFor.js | 13 +++++----
3 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/models/doctype/Payment/Payment.js b/models/doctype/Payment/Payment.js
index 00ca943d..d58b060c 100644
--- a/models/doctype/Payment/Payment.js
+++ b/models/doctype/Payment/Payment.js
@@ -109,9 +109,9 @@ export default {
label: 'Amount',
fieldtype: 'Currency',
required: 1,
- formula: (doc) => doc.getSum('for', 'amount'),
+ formula: (doc) => doc.getSum('for', 'amount', false),
validate(value, doc) {
- if (value < 0) {
+ if (value.isNegative()) {
throw new frappe.errors.ValidationError(
frappe._(
`Payment amount cannot be less than zero. Amount has been reset.`
@@ -120,9 +120,9 @@ export default {
}
if (doc.for.length === 0) return;
- const amount = doc.getSum('for', 'amount');
+ const amount = doc.getSum('for', 'amount', false);
- if (value > amount) {
+ if (value.gt(amount)) {
throw new frappe.errors.ValidationError(
frappe._(
`Payment amount cannot exceed ${frappe.format(
@@ -131,7 +131,7 @@ export default {
)}. Amount has been reset.`
)
);
- } else if (value === 0) {
+ } else if (value.isZero()) {
throw new frappe.errors.ValidationError(
frappe._(
`Payment amount cannot be ${frappe.format(
@@ -147,7 +147,6 @@ export default {
fieldname: 'writeoff',
label: 'Write Off / Refund',
fieldtype: 'Currency',
- default: 0,
},
{
fieldname: 'for',
diff --git a/models/doctype/Payment/PaymentServer.js b/models/doctype/Payment/PaymentServer.js
index 32931f64..d5660c32 100644
--- a/models/doctype/Payment/PaymentServer.js
+++ b/models/doctype/Payment/PaymentServer.js
@@ -46,9 +46,9 @@ export default class PaymentServer extends BaseDocument {
}
updateAmountOnReferenceUpdate() {
- this.amount = 0;
+ this.amount = frappe.pesa(0);
for (let paymentReference of this.for) {
- this.amount += paymentReference.amount;
+ this.amount = this.amount.add(paymentReference.amount);
}
}
@@ -73,18 +73,19 @@ export default class PaymentServer extends BaseDocument {
if (!this.for?.length) return;
const referenceAmountTotal = this.for
.map(({ amount }) => amount)
- .reduce((a, b) => a + b, 0);
+ .reduce((a, b) => a.add(b), frappe.pesa(0));
- if (this.amount + (this.writeoff ?? 0) < referenceAmountTotal) {
+ if (this.amount.add(this.writeoff ?? 0).lt(referenceAmountTotal)) {
const writeoff = frappe.format(this.writeoff, 'Currency');
const payment = frappe.format(this.amount, 'Currency');
const refAmount = frappe.format(referenceAmountTotal, 'Currency');
- const writeoffString =
- this.writeoff > 0 ? `and writeoff: ${writeoff} ` : '';
+ const writeoffString = this.writeoff.gt(0)
+ ? `and writeoff: ${writeoff} `
+ : '';
throw new Error(
frappe._(
- `Amount: ${payment} ${writeoffString}is less than the total amount allocated to references: ${refAmount}`
+ `Amount: ${payment} ${writeoffString}is less than the total amount allocated to references: ${refAmount}.`
)
);
}
@@ -113,18 +114,28 @@ export default class PaymentServer extends BaseDocument {
if (outstandingAmount == null) {
outstandingAmount = baseGrandTotal;
}
- if (this.amount <= 0 || this.amount > outstandingAmount) {
+ if (this.amount.lte(0) || this.amount.gt(outstandingAmount)) {
let message = frappe._(
- `Payment amount (${this.amount}) should be less than Outstanding amount (${outstandingAmount}).`
+ `Payment amount: ${frappe.format(
+ this.amount,
+ 'Currency'
+ )} should be less than Outstanding amount: ${frappe.format(
+ outstandingAmount,
+ 'Currency'
+ )}.`
);
- if (this.amount <= 0) {
- const amt = this.amount < 0 ? ` (${this.amount})` : '';
+
+ if (this.amount.lte(0)) {
+ const amt = this.amount.lt(0)
+ ? `: ${frappe.format(this.amount, 'Currency')}`
+ : '';
message = frappe._(`Payment amount${amt} should be greater than 0.`);
}
+
throw new frappe.errors.ValidationError(message);
} else {
// update outstanding amounts in invoice and party
- let newOutstanding = outstandingAmount - this.amount;
+ let newOutstanding = outstandingAmount.sub(this.amount);
await referenceDoc.set('outstandingAmount', newOutstanding);
await referenceDoc.update();
let party = await frappe.getDoc('Party', this.party);
@@ -147,7 +158,9 @@ export default class PaymentServer extends BaseDocument {
async updateReferenceOutstandingAmount() {
await this.for.forEach(async ({ amount, referenceType, referenceName }) => {
const refDoc = await frappe.getDoc(referenceType, referenceName);
- refDoc.update({ outstandingAmount: refDoc.outstandingAmount + amount });
+ refDoc.update({
+ outstandingAmount: refDoc.outstandingAmount.add(amount),
+ });
});
}
}
diff --git a/models/doctype/PaymentFor/PaymentFor.js b/models/doctype/PaymentFor/PaymentFor.js
index 7fd4153f..cee513df 100644
--- a/models/doctype/PaymentFor/PaymentFor.js
+++ b/models/doctype/PaymentFor/PaymentFor.js
@@ -1,4 +1,6 @@
+import frappe from 'frappejs';
import { _ } from 'frappejs/utils';
+
const referenceTypeMap = {
SalesInvoice: _('Invoice'),
PurchaseInvoice: _('Bill'),
@@ -38,12 +40,13 @@ export default {
fieldname: 'amount',
label: 'Amount',
fieldtype: 'Currency',
- placeholder: '0.00',
formula: (row, doc) => {
- return doc.getFrom(
- row.referenceType,
- row.referenceName,
- 'outstandingAmount'
+ return (
+ doc.getFrom(
+ row.referenceType,
+ row.referenceName,
+ 'outstandingAmount'
+ ) || frappe.pesa(0)
);
},
required: 1,
From b4957c3a644c2928a7a6401cf75b3f674943512f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 13:00:15 +0530
Subject: [PATCH 12/25] fix: update JE, fix validation message
---
accounting/ledgerPosting.js | 5 +++-
.../JournalEntry/JournalEntryServer.js | 6 ++---
.../JournalEntryAccount.js | 27 ++++++++++---------
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.js
index 2febe251..57583eff 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.js
@@ -123,7 +123,10 @@ export default class LedgerPosting {
let { debit, credit } = this.getTotalDebitAndCredit();
if (!debit.eq(credit)) {
throw new Error(
- `Total Debit (${debit.round()}) must be equal to Total Credit (${credit.round()})`
+ `Total Debit: ${frappe.format(
+ debit,
+ 'Currency'
+ )} must be equal to Total Credit: ${frappe.format(credit, 'Currency')}`
);
}
}
diff --git a/models/doctype/JournalEntry/JournalEntryServer.js b/models/doctype/JournalEntry/JournalEntryServer.js
index 69a24fc7..f9a271ed 100644
--- a/models/doctype/JournalEntry/JournalEntryServer.js
+++ b/models/doctype/JournalEntry/JournalEntryServer.js
@@ -6,9 +6,9 @@ export default class JournalEntryServer extends BaseDocument {
let entries = new LedgerPosting({ reference: this });
for (let row of this.accounts) {
- if (row.debit) {
+ if (!row.debit.isZero()) {
entries.debit(row.account, row.debit);
- } else if (row.credit) {
+ } else if (!row.credit.isZero()) {
entries.credit(row.account, row.credit);
}
}
@@ -31,4 +31,4 @@ export default class JournalEntryServer extends BaseDocument {
async afterRevert() {
await this.getPosting().postReverse();
}
-};
+}
diff --git a/models/doctype/JournalEntryAccount/JournalEntryAccount.js b/models/doctype/JournalEntryAccount/JournalEntryAccount.js
index 75b5b611..dc6e601c 100644
--- a/models/doctype/JournalEntryAccount/JournalEntryAccount.js
+++ b/models/doctype/JournalEntryAccount/JournalEntryAccount.js
@@ -10,34 +10,35 @@ export default {
target: 'Account',
required: 1,
groupBy: 'rootType',
- getFilters: () => ({ isGroup: 0 })
+ getFilters: () => ({ isGroup: 0 }),
},
{
fieldname: 'debit',
label: 'Debit',
fieldtype: 'Currency',
- formula: autoDebitCredit('debit')
+ formula: autoDebitCredit('debit'),
},
{
fieldname: 'credit',
label: 'Credit',
fieldtype: 'Currency',
- formula: autoDebitCredit('credit')
- }
+ formula: autoDebitCredit('credit'),
+ },
],
- tableFields: ['account', 'debit', 'credit']
+ tableFields: ['account', 'debit', 'credit'],
};
-function autoDebitCredit(type = 'debit') {
+function autoDebitCredit(type) {
let otherType = type === 'debit' ? 'credit' : 'debit';
- return (row, doc) => {
- if (row[type] == 0) return null;
- if (row[otherType]) return null;
- let totalType = doc.getSum('accounts', type);
- let totalOtherType = doc.getSum('accounts', otherType);
- if (totalType < totalOtherType) {
- return totalOtherType - totalType;
+ return (row, doc) => {
+ if (!row[otherType].isZero()) return frappe.pesa(0);
+
+ let totalType = doc.getSum('accounts', type, false);
+ let totalOtherType = doc.getSum('accounts', otherType, false);
+
+ if (totalType.lt(totalOtherType)) {
+ return totalOtherType.sub(totalType);
}
};
}
From 373684aab728786c7f576429a99a5127574d6f8d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 13:12:21 +0530
Subject: [PATCH 13/25] fix: update Account, Item models Currency fields
---
models/doctype/Account/Account.js | 1 -
models/doctype/Item/Item.js | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/models/doctype/Account/Account.js b/models/doctype/Account/Account.js
index 61ddf4f7..f859f8d3 100644
--- a/models/doctype/Account/Account.js
+++ b/models/doctype/Account/Account.js
@@ -68,7 +68,6 @@ export default {
fieldname: 'balance',
label: 'Balance',
fieldtype: 'Currency',
- default: '0',
readOnly: 1,
},
{
diff --git a/models/doctype/Item/Item.js b/models/doctype/Item/Item.js
index 324df387..3a096093 100644
--- a/models/doctype/Item/Item.js
+++ b/models/doctype/Item/Item.js
@@ -104,9 +104,8 @@ export default {
fieldname: 'rate',
label: 'Rate',
fieldtype: 'Currency',
- placeholder: '0.00',
validate(value) {
- if (!value) {
+ if (value.lte(0)) {
throw new frappe.errors.ValidationError(
'Rate must be greater than 0'
);
From de17463bd21fb3d23bc7bb81c5c58e6edeaee1ca Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 17:03:58 +0530
Subject: [PATCH 14/25] fix: use neg, neq, update reports GL, PnL, BS, TB
---
accounting/ledgerPosting.js | 8 +-
.../FinancialStatements.js | 115 +++++++++++-------
reports/GeneralLedger/GeneralLedger.js | 9 +-
3 files changed, 81 insertions(+), 51 deletions(-)
diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.js
index 57583eff..4bd9c603 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.js
@@ -29,13 +29,13 @@ export default class LedgerPosting {
const debitAccounts = ['Asset', 'Expense'];
const { rootType } = await frappe.getDoc('Account', accountName);
if (debitAccounts.indexOf(rootType) === -1) {
- const change = type == 'credit' ? amount : amount.mul(-1);
+ const change = type == 'credit' ? amount : amount.neg();
this.accountEntries.push({
name: accountName,
balanceChange: change,
});
} else {
- const change = type == 'debit' ? amount : amount.mul(-1);
+ const change = type == 'debit' ? amount : amount.neg();
this.accountEntries.push({
name: accountName,
balanceChange: change,
@@ -95,7 +95,7 @@ export default class LedgerPosting {
entry.reverted = 1;
}
for (let entry of this.accountEntries) {
- entry.balanceChange = entry.balanceChange.mul(-1);
+ entry.balanceChange = entry.balanceChange.neg();
}
await this.insertEntries();
}
@@ -121,7 +121,7 @@ export default class LedgerPosting {
validateEntries() {
let { debit, credit } = this.getTotalDebitAndCredit();
- if (!debit.eq(credit)) {
+ if (debit.neq(credit)) {
throw new Error(
`Total Debit: ${frappe.format(
debit,
diff --git a/reports/FinancialStatements/FinancialStatements.js b/reports/FinancialStatements/FinancialStatements.js
index d9aaf1b7..7747ad14 100644
--- a/reports/FinancialStatements/FinancialStatements.js
+++ b/reports/FinancialStatements/FinancialStatements.js
@@ -1,6 +1,6 @@
import frappe from 'frappejs';
+import { isPesa } from 'frappejs/utils';
import { DateTime } from 'luxon';
-import { unique } from 'frappejs/utils';
export async function getData({
rootType,
@@ -8,7 +8,7 @@ export async function getData({
fromDate,
toDate,
periodicity = 'Monthly',
- accumulateValues = false
+ accumulateValues = false,
}) {
let accounts = await getAccounts(rootType);
let fiscalYear = await getFiscalYear();
@@ -17,19 +17,19 @@ export async function getData({
for (let account of accounts) {
const entries = ledgerEntries.filter(
- entry => entry.account === account.name
+ (entry) => entry.account === account.name
);
for (let entry of entries) {
let periodKey = getPeriodKey(entry.date, periodicity);
if (!account[periodKey]) {
- account[periodKey] = 0.0;
+ account[periodKey] = frappe.pesa(0.0);
}
const multiplier = balanceMustBe === 'Debit' ? 1 : -1;
- const value = (entry.debit - entry.credit) * multiplier;
- account[periodKey] += value;
+ const value = entry.debit.sub(entry.credit).mul(multiplier);
+ account[periodKey] = value.add(account[periodKey]);
}
}
@@ -40,28 +40,34 @@ export async function getData({
for (let account of accounts) {
if (!account[periodKey]) {
- account[periodKey] = 0.0;
+ account[periodKey] = frappe.pesa(0.0);
}
- account[periodKey] += account[previousPeriodKey] || 0.0;
+
+ account[periodKey] = account[periodKey].add(
+ account[previousPeriodKey] ?? 0
+ );
}
});
}
// calculate totalRow
let totalRow = {
- account: `Total ${rootType} (${balanceMustBe})`
+ account: `Total ${rootType} (${balanceMustBe})`,
};
- periodList.forEach(periodKey => {
+ periodList.forEach((periodKey) => {
if (!totalRow[periodKey]) {
- totalRow[periodKey] = 0.0;
+ totalRow[periodKey] = frappe.pesa(0.0);
}
for (let account of accounts) {
- totalRow[periodKey] += account[periodKey] || 0.0;
+ totalRow[periodKey] = totalRow[periodKey].add(account[periodKey] ?? 0.0);
}
});
+ convertToFloat(totalRow);
+ accounts.forEach(convertToFloat);
+
return { accounts, totalRow, periodList };
}
@@ -71,42 +77,50 @@ export async function getTrialBalance({ rootType, fromDate, toDate }) {
for (let account of accounts) {
const accountEntries = ledgerEntries.filter(
- entry => entry.account === account.name
+ (entry) => entry.account === account.name
);
// opening
const beforePeriodEntries = accountEntries.filter(
- entry => entry.date < fromDate
+ (entry) => entry.date < fromDate
+ );
+ account.opening = beforePeriodEntries.reduce(
+ (acc, entry) => acc.add(entry.debit).sub(entry.credit),
+ frappe.pesa(0)
);
- account.opening = beforePeriodEntries.reduce((acc, entry) => {
- return acc + (entry.debit - entry.credit);
- }, 0);
- if (account.opening >= 0) {
+ if (account.opening.gte(0)) {
account.openingDebit = account.opening;
+ account.openingCredit = frappe.pesa(0);
} else {
- account.openingCredit = -account.opening;
+ account.openingCredit = account.opening.neg();
+ account.openingDebit = frappe.pesa(0);
}
// debit / credit
const periodEntries = accountEntries.filter(
- entry => entry.date >= fromDate && entry.date < toDate
+ (entry) => entry.date >= fromDate && entry.date < toDate
+ );
+ account.debit = periodEntries.reduce(
+ (acc, entry) => acc.add(entry.debit),
+ frappe.pesa(0)
);
- account.debit = periodEntries.reduce((acc, entry) => acc + entry.debit, 0);
account.credit = periodEntries.reduce(
- (acc, entry) => acc + entry.credit,
- 0
+ (acc, entry) => acc.add(entry.credit),
+ frappe.pesa(0)
);
// closing
- account.closing = account.opening + account.debit - account.credit;
+ account.closing = account.opening.add(account.debit).sub(account.credit);
- if (account.closing >= 0) {
+ if (account.closing.gte(0)) {
account.closingDebit = account.closing;
+ account.closingCredit = frappe.pesa(0);
} else {
- account.closingCredit = -account.closing;
+ account.closingCredit = account.closing.neg();
+ account.closingDebit = frappe.pesa(0);
}
- if (account.debit != 0 || account.credit != 0) {
+ if (account.debit.neq(0) || account.credit.neq(0)) {
setParentEntry(account, account.parentAccount);
}
}
@@ -114,13 +128,13 @@ export async function getTrialBalance({ rootType, fromDate, toDate }) {
function setParentEntry(leafAccount, parentName) {
for (let acc of accounts) {
if (acc.name === parentName) {
- acc.debit += leafAccount.debit;
- acc.credit += leafAccount.credit;
- acc.closing = acc.opening + acc.debit - acc.credit;
- if (acc.closing >= 0) {
+ acc.debit = acc.debit.add(leafAccount.debit);
+ acc.credit = acc.credit.add(leafAccount.credit);
+ acc.closing = acc.opening.add(acc.debit).sub(acc.credit);
+ if (acc.closing.gte(0)) {
acc.closingDebit = acc.closing;
} else {
- acc.closingCredit = -acc.closing;
+ acc.closingCredit = acc.closing.neg();
}
if (acc.parentAccount) {
setParentEntry(leafAccount, acc.parentAccount);
@@ -131,6 +145,7 @@ export async function getTrialBalance({ rootType, fromDate, toDate }) {
}
}
+ accounts.forEach(convertToFloat);
return accounts;
}
@@ -143,7 +158,7 @@ export function getPeriodList(fromDate, toDate, periodicity, fiscalYear) {
Monthly: 1,
Quarterly: 3,
'Half Yearly': 6,
- Yearly: 12
+ Yearly: 12,
}[periodicity];
let startDate = DateTime.fromISO(fromDate).startOf('month');
@@ -173,13 +188,13 @@ function getPeriodKey(date, periodicity) {
1: `Jan ${year} - Mar ${year}`,
2: `Apr ${year} - Jun ${year}`,
3: `Jun ${year} - Sep ${year}`,
- 4: `Oct ${year} - Dec ${year}`
+ 4: `Oct ${year} - Dec ${year}`,
}[quarter];
},
'Half Yearly': () => {
return {
1: `Apr ${year} - Sep ${year}`,
- 2: `Oct ${year} - Mar ${year}`
+ 2: `Oct ${year} - Mar ${year}`,
}[[2, 3].includes(quarter) ? 1 : 2];
},
Yearly: () => {
@@ -187,7 +202,7 @@ function getPeriodKey(date, periodicity) {
return `${year} - ${year + 1}`;
}
return `${year - 1} - ${year}`;
- }
+ },
}[periodicity];
return getKey();
@@ -200,7 +215,7 @@ function setIndentLevel(accounts, parentAccount, level) {
level = 0;
}
- accounts.forEach(account => {
+ accounts.forEach((account) => {
if (
account.parentAccount === parentAccount &&
account.indent === undefined
@@ -220,7 +235,7 @@ function sortAccounts(accounts) {
pushToOut(null);
function pushToOut(parentAccount) {
- accounts.forEach(account => {
+ accounts.forEach((account) => {
if (account.parentAccount === parentAccount && !pushed[account.name]) {
out.push(account);
pushed[account.name] = 1;
@@ -247,9 +262,9 @@ async function getLedgerEntries(fromDate, toDate, accounts) {
doctype: 'AccountingLedgerEntry',
fields: ['account', 'debit', 'credit', 'date'],
filters: {
- account: ['in', accounts.map(d => d.name)],
- date: dateFilter()
- }
+ account: ['in', accounts.map((d) => d.name)],
+ date: dateFilter(),
+ },
});
return ledgerEntries;
@@ -260,14 +275,14 @@ async function getAccounts(rootType) {
doctype: 'Account',
fields: ['name', 'parentAccount', 'isGroup'],
filters: {
- rootType
- }
+ rootType,
+ },
});
accounts = setIndentLevel(accounts);
accounts = sortAccounts(accounts);
- accounts.forEach(account => {
+ accounts.forEach((account) => {
account.account = account.name;
});
@@ -280,12 +295,20 @@ async function getFiscalYear() {
);
return {
start: fiscalYearStart,
- end: fiscalYearEnd
+ end: fiscalYearEnd,
};
}
+function convertToFloat(obj) {
+ Object.keys(obj).forEach((key) => {
+ if (!isPesa(obj[key])) return;
+
+ obj[key] = obj[key].float;
+ });
+}
+
export default {
getData,
getTrialBalance,
- getPeriodList
+ getPeriodList,
};
diff --git a/reports/GeneralLedger/GeneralLedger.js b/reports/GeneralLedger/GeneralLedger.js
index 9c6b919d..11885ff9 100644
--- a/reports/GeneralLedger/GeneralLedger.js
+++ b/reports/GeneralLedger/GeneralLedger.js
@@ -29,7 +29,14 @@ class GeneralLedger {
],
filters: filters,
})
- ).filter((d) => !d.reverted || (d.reverted && params.reverted));
+ )
+ .filter((d) => !d.reverted || (d.reverted && params.reverted))
+ .map((row) => {
+ row.debit = row.debit.float;
+ row.credit = row.credit.float;
+
+ return row;
+ });
return this.appendOpeningEntry(data);
}
From b69505bdbb7b1479ddf656fabffc1fd44f93e67e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 29 Dec 2021 17:22:38 +0530
Subject: [PATCH 15/25] fix: minor fixes to dashboard
---
src/pages/Dashboard/ProfitAndLoss.vue | 26 +++++++++++-----------
src/pages/Dashboard/UnpaidInvoices.vue | 30 +++++++++++++-------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/pages/Dashboard/ProfitAndLoss.vue b/src/pages/Dashboard/ProfitAndLoss.vue
index 28686cec..33e273fa 100644
--- a/src/pages/Dashboard/ProfitAndLoss.vue
+++ b/src/pages/Dashboard/ProfitAndLoss.vue
@@ -5,7 +5,7 @@
@@ -28,14 +28,14 @@ export default {
name: 'ProfitAndLoss',
components: {
PeriodSelector,
- SectionHeader
+ SectionHeader,
},
data: () => ({ period: 'This Year', hasData: false }),
activated() {
this.render();
},
watch: {
- period: 'render'
+ period: 'render',
},
methods: {
async render() {
@@ -47,11 +47,11 @@ export default {
let res = await pl.run({
fromDate,
toDate,
- periodicity
+ periodicity,
});
let totalRow = res.rows[res.rows.length - 1];
- this.hasData = res.columns.some(key => totalRow[key] !== 0);
+ this.hasData = res.columns.some((key) => totalRow[key] !== 0);
if (!this.hasData) return;
this.$nextTick(() => this.renderChart(res));
},
@@ -66,10 +66,10 @@ export default {
axisOptions: {
xAxisMode: 'tick',
shortenYAxisNumbers: true,
- xIsSeries: true
+ xIsSeries: true,
},
tooltipOptions: {
- formatTooltipY: value => frappe.format(value, 'Currency')
+ formatTooltipY: (value) => frappe.format(value ?? 0, 'Currency'),
},
data: {
labels: res.columns,
@@ -77,12 +77,12 @@ export default {
{
name: 'Income',
chartType: 'bar',
- values: res.columns.map(key => totalRow[key])
- }
- ]
- }
+ values: res.columns.map((key) => totalRow[key]),
+ },
+ ],
+ },
});
- }
- }
+ },
+ },
};
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 2c85586a..327124b6 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -11,7 +11,7 @@
v-if="invoice.hasData"
slot="action"
:value="$data[invoice.periodKey]"
- @change="value => ($data[invoice.periodKey] = value)"
+ @change="(value) => ($data[invoice.periodKey] = value)"
/>