tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix: Product query was giving the version id and not product id.

Browse Source 
The product ledger query needs to be uniqued.
This commit is contained in:
Amritanshu Agrawal
2025-06-26 09:16:59 +00:00
parent 506123803a
commit 2496b5c16e
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
brewman/brewman/routers/product.py
View File

@ -511,7 +511,7 @@ async def show_term_product(
for item in db.execute(query_).unique().scalars().all(): for item in db.execute(query_).unique().scalars().all():
list_.append( list_.append(
ProductSku( ProductSku(
id_=item.id, id_=item.product_id,
name=item.name, name=item.name,
fraction_units=item.fraction_units, fraction_units=item.fraction_units,
cost_price=Decimal(0), cost_price=Decimal(0),

48
brewman/brewman/routers/reports/product_ledger.py
View File

@ -86,29 +86,33 @@ def build_report(
SkuVersion.valid_till >= Voucher.date_, SkuVersion.valid_till >= Voucher.date_,
), ),
) )
query: list[tuple[Voucher, Inventory, Journal, SkuVersion]] = db.execute( # type: ignore[assignment] query: list[tuple[Voucher, Inventory, Journal, SkuVersion]] = (
select(Voucher, Inventory, Journal, SkuVersion) db.execute( # type: ignore[assignment]
.select_from(Voucher) select(Voucher, Inventory, Journal, SkuVersion)
.join(Voucher.journals) .select_from(Voucher)
.join(Journal.account) .join(Voucher.journals)
.join(Journal.cost_centre) .join(Journal.account)
.join(Voucher.inventories) .join(Journal.cost_centre)
.join(Inventory.batch) .join(Voucher.inventories)
.join(Batch.sku) .join(Inventory.batch)
.join(SkuVersion, onclause=sku_version_onclause) .join(Batch.sku)
.join(StockKeepingUnit.product) .join(SkuVersion, onclause=sku_version_onclause)
.options( .join(StockKeepingUnit.product)
contains_eager(Voucher.journals).contains_eager(Journal.account), .options(
contains_eager(Voucher.journals).contains_eager(Journal.cost_centre), contains_eager(Voucher.journals).contains_eager(Journal.account),
contains_eager(Voucher.journals).contains_eager(Journal.cost_centre),
)
.where(
StockKeepingUnit.product_id == product_id,
Journal.cost_centre_id != CostCentre.cost_centre_purchase(),
Voucher.date_ >= start_date,
Voucher.date_ <= finish_date,
)
.order_by(Voucher.date_, Voucher.last_edit_date)
) )
.where( .unique()
StockKeepingUnit.product_id == product_id, .all()
Journal.cost_centre_id != CostCentre.cost_centre_purchase(), )
Voucher.date_ >= start_date,
Voucher.date_ <= finish_date,
)
.order_by(Voucher.date_, Voucher.last_edit_date)
).all()
for voucher, inventory, journal, stockKeepingUnit in query: for voucher, inventory, journal, stockKeepingUnit in query:
journal_debit = journal.debit * -1 journal_debit = journal.debit * -1