accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-08 23:00:56 +00:00
Code Issues Releases Activity

incr: fix default fieldname

Browse Source 
- fix passed date
This commit is contained in:
18alantom 2023-06-06 13:49:59 +05:30
parent ce4481b609
commit 96cad8a3d5
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
models/baseModels/Invoice/Invoice.ts
View File

@ -107,7 +107,9 @@ export abstract class Invoice extends Transactional {
} }
get autoStockTransferLocation(): string | null { get autoStockTransferLocation(): string | null {
const fieldname = this.isSales ? '' : 'purchasePaymentAccount'; const fieldname = this.isSales
? 'shipmentLocation'
: 'purchaseReceiptLocation';
const value = this.fyo.singles.Defaults?.[fieldname]; const value = this.fyo.singles.Defaults?.[fieldname];
if (typeof value === 'string' && value.length) { if (typeof value === 'string' && value.length) {
return value; return value;
@ -436,6 +438,12 @@ export abstract class Invoice extends Transactional {
formula: () => !!this.autoPaymentAccount, formula: () => !!this.autoPaymentAccount,
dependsOn: [], dependsOn: [],
}, },
makeAutoStockTransfer: {
formula: () =>
!!this.fyo.singles.AccountingSettings?.enableInventory &&
!!this.autoStockTransferLocation,
dependsOn: [],
},
}; };
getStockTransferred() { getStockTransferred() {
@ -511,6 +519,10 @@ export abstract class Invoice extends Transactional {
static defaults: DefaultMap = { static defaults: DefaultMap = {
makeAutoPayment: (doc) => makeAutoPayment: (doc) =>
doc instanceof Invoice && !!doc.autoPaymentAccount, doc instanceof Invoice && !!doc.autoPaymentAccount,
makeAutoStockTransfer: (doc) =>
!!doc.fyo.singles.AccountingSettings?.enableInventory &&
doc instanceof Invoice &&
!!doc.autoStockTransferLocation,
numberSeries: (doc) => getNumberSeries(doc.schemaName, doc.fyo), numberSeries: (doc) => getNumberSeries(doc.schemaName, doc.fyo),
terms: (doc) => { terms: (doc) => {
const defaults = doc.fyo.singles.Defaults as Defaults | undefined; const defaults = doc.fyo.singles.Defaults as Defaults | undefined;
@ -669,9 +681,15 @@ export abstract class Invoice extends Transactional {
if (isAuto) { if (isAuto) {
const stock = const stock =
(await this.fyo.db.getStockQuantity(item, location!, data.date)) ?? 0; (await this.fyo.db.getStockQuantity(
item,
location!,
undefined,
data.date
)) ?? 0;
console.log(quantity, stock);
if (stock <= quantity) { if (stock < quantity) {
continue; continue;
} }
} }