Merge branch 'develop'

This commit is contained in:
Methapon2001 2025-01-30 16:47:05 +07:00
commit da6003d19d

View file

@ -194,6 +194,7 @@ export class QuotationController extends Controller {
@Query() urgentFirst?: boolean,
@Query() includeRegisteredBranch?: boolean,
@Query() hasCancel?: boolean,
@Query() forDebitNote?: boolean,
@Query() code?: string,
@Query() query = "",
) {
@ -218,7 +219,7 @@ export class QuotationController extends Controller {
code,
payCondition,
registeredBranch: isSystem(req.user) ? undefined : { OR: permissionCond(req.user) },
quotationStatus: status,
quotationStatus: forDebitNote ? { notIn: ["Issued", "Expired"] } : status,
requestData: hasCancel
? {
some: {