QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 05:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: inventory item detail bug.

Browse Source
This commit is contained in:
a.bouhuolia
2021-06-02 12:31:12 +02:00
parent 018106e4d8
commit b45a85c2e4
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/services/FinancialStatements/CashFlow/CashFlow.ts
View File

@@ -700,7 +700,7 @@ class CashFlowStatement extends FinancialSheet implements ICashFlowStatement {
sections, sections,
this.isAccountLeafNoneZero.bind(this), this.isAccountLeafNoneZero.bind(this),
MAP_CONFIG MAP_CONFIG
); ) || [];
} }
/** /**
@@ -713,7 +713,7 @@ class CashFlowStatement extends FinancialSheet implements ICashFlowStatement {
sections, sections,
this.isAccountsSectionHasChildren.bind(this), this.isAccountsSectionHasChildren.bind(this),
MAP_CONFIG MAP_CONFIG
); ) || [];
} }
/** /**

26
server/src/services/FinancialStatements/InventoryDetails/InventoryDetails.ts
View File

@@ -191,7 +191,7 @@ export default class InventoryDetails extends FinancialSheet {
const quantityMovement = amountMovement(transaction.quantity); const quantityMovement = amountMovement(transaction.quantity);
const cost = defaultTo(transaction?.costLotAggregated.cost, 0); const cost = defaultTo(transaction?.costLotAggregated.cost, 0);
// Profit margin. // Profit margin.
const profitMargin = total - cost; const profitMargin = total - cost;
// Value from computed cost in `OUT` or from total sell price in `IN` transaction. // Value from computed cost in `OUT` or from total sell price in `IN` transaction.
@@ -268,8 +268,11 @@ export default class InventoryDetails extends FinancialSheet {
)[] { )[] {
const transactions = this.getItemTransactions(item); const transactions = this.getItemTransactions(item);
const openingValuation = this.getItemOpeingValuation(item); const openingValuation = this.getItemOpeingValuation(item);
const closingValuation = this.getItemClosingValuation(item, transactions); const closingValuation = this.getItemClosingValuation(
item,
transactions,
openingValuation
);
const hasTransactions = transactions.length > 0; const hasTransactions = transactions.length > 0;
const isItemHasOpeningBalance = this.isItemHasOpeningBalance(item.id); const isItemHasOpeningBalance = this.isItemHasOpeningBalance(item.id);
@@ -314,17 +317,21 @@ export default class InventoryDetails extends FinancialSheet {
*/ */
private getItemClosingValuation( private getItemClosingValuation(
item: IItem, item: IItem,
transactions: IInventoryDetailsItemTransaction[] transactions: IInventoryDetailsItemTransaction[],
openingValuation: IInventoryDetailsOpening
): IInventoryDetailsOpening { ): IInventoryDetailsOpening {
const value = sumBy(transactions, 'valueMovement.number'); const value = sumBy(transactions, 'valueMovement.number');
const quantity = sumBy(transactions, 'quantityMovement.number'); const quantity = sumBy(transactions, 'quantityMovement.number');
const profitMargin = sumBy(transactions, 'profitMargin.number'); const profitMargin = sumBy(transactions, 'profitMargin.number');
const closingQuantity = quantity + openingValuation.quantity.number;
const closingValue = value + openingValuation.value.number;
return { return {
nodeType: INodeTypes.CLOSING_ENTRY, nodeType: INodeTypes.CLOSING_ENTRY,
date: this.getDateMeta(this.query.toDate), date: this.getDateMeta(this.query.toDate),
quantity: this.getTotalNumberMeta(quantity), quantity: this.getTotalNumberMeta(closingQuantity),
value: this.getTotalNumberMeta(value), value: this.getTotalNumberMeta(closingValue),
profitMargin: this.getTotalNumberMeta(profitMargin), profitMargin: this.getTotalNumberMeta(profitMargin),
}; };
} }
@@ -385,7 +392,12 @@ export default class InventoryDetails extends FinancialSheet {
* @returns {IInventoryDetailsItem[]} * @returns {IInventoryDetailsItem[]}
*/ */
private filterItemsNodes(items: IInventoryDetailsItem[]) { private filterItemsNodes(items: IInventoryDetailsItem[]) {
return filterDeep(items, this.isFilterNode.bind(this), MAP_CONFIG); const filtered = filterDeep(
items,
this.isFilterNode.bind(this),
MAP_CONFIG
);
return defaultTo(filtered, []);
} }
/** /**