mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 13:32:00 +00:00
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:
@@ -605,7 +605,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
loadMore: loadMoreStockProducts,
|
||||
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
|
||||
flags: 'PAKAN,OVK',
|
||||
limit: '100',
|
||||
location_id: stockProductsLocationId,
|
||||
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
|
||||
});
|
||||
|
||||
const {
|
||||
@@ -613,7 +615,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
isLoadingOptions: isLoadingDepletionProducts,
|
||||
loadMore: loadMoreDepletionProducts,
|
||||
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', '', {
|
||||
limit: '100',
|
||||
location_id: depletionProductsLocationId,
|
||||
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
|
||||
type: 'AYAM',
|
||||
});
|
||||
|
||||
@@ -678,8 +682,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
isLoadingOptions: isLoadingEggProducts,
|
||||
loadMore: loadMoreEggProducts,
|
||||
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
|
||||
limit: '100',
|
||||
type: 'TELUR',
|
||||
location_id: eggProductsLocationId,
|
||||
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
|
||||
});
|
||||
|
||||
const approvedProjectFlockKandangsUrl = useMemo(() => {
|
||||
|
||||
@@ -50,7 +50,11 @@ export const isProductWarehouseSelectableForKandang = (
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user