Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production

This commit is contained in:
Fadli 2022-08-30 17:41:01 +07:00
commit 3cc20691e9

View File

@ -292,7 +292,7 @@ export class ProductService {
'current_price.partner_id is NULL and current_price.end_date is NULL', 'current_price.partner_id is NULL and current_price.end_date is NULL',
) )
.where( .where(
`product.supplier_id = :supplier_id and status_history.status = 'ACTIVE'`, `product.supplier_id = :supplier_id and status_history.status = 'ACTIVE' and status_history.partner_id is NULL`,
{ {
supplier_id: supplier, supplier_id: supplier,
}, },