Merge branch 'codex/sales-at-farm-level' into 'development'

codex/fix: purchase receivement error and recording doesn't show depletion/egg

See merge request mbugroup/lti-web-client!360
This commit is contained in:
Adnan Zahir
2026-04-01 11:10:29 +07:00
2 changed files with 11 additions and 1 deletions
@@ -605,7 +605,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
loadMore: loadMoreStockProducts, loadMore: loadMoreStockProducts,
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', { } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
flags: 'PAKAN,OVK', flags: 'PAKAN,OVK',
limit: '100',
location_id: stockProductsLocationId, location_id: stockProductsLocationId,
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
}); });
const { const {
@@ -613,7 +615,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
isLoadingOptions: isLoadingDepletionProducts, isLoadingOptions: isLoadingDepletionProducts,
loadMore: loadMoreDepletionProducts, loadMore: loadMoreDepletionProducts,
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', '', { } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', '', {
limit: '100',
location_id: depletionProductsLocationId, location_id: depletionProductsLocationId,
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
type: 'AYAM', type: 'AYAM',
}); });
@@ -678,8 +682,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
isLoadingOptions: isLoadingEggProducts, isLoadingOptions: isLoadingEggProducts,
loadMore: loadMoreEggProducts, loadMore: loadMoreEggProducts,
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', { } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
limit: '100',
type: 'TELUR', type: 'TELUR',
location_id: eggProductsLocationId, location_id: eggProductsLocationId,
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
}); });
const approvedProjectFlockKandangsUrl = useMemo(() => { const approvedProjectFlockKandangsUrl = useMemo(() => {
+5 -1
View File
@@ -50,7 +50,11 @@ export const isProductWarehouseSelectableForKandang = (
} }
if (warehouse.type === 'KANDANG') { if (warehouse.type === 'KANDANG') {
return Boolean(kandangId) && warehouse.kandang?.id === kandangId; return (
Boolean(kandangId) &&
(warehouse.kandang?.id === kandangId ||
productWarehouse.project_flock_kandang?.kandang_id === kandangId)
);
} }
return false; return false;