merge: resolve conflict

src/types/api/inventory/adjustment.d.ts

@@ -0,0 +1,30 @@
+import { Product } from '@/types/api/master-data/product';
+import { Warehouse } from '../master-data/warehouse';
+
+export type BaseInventoryAdjustment = {
+  id: number;
+  transaction_type: string;
+  quantity: number;
+  before_quantity: number;
+  after_quantity: number;
+  note: string;
+  product_warehouse_id: number;
+  product_warehouse: {
+    id: number;
+    quantity: number;
+    product_id: number;
+    warehouse_id: number;
+    product: Product;
+    warehouse: Warehouse;
+  };
+};
+
+export type InventoryAdjustment = BaseMetadata & BaseInventoryAdjustment;
+
+export type CreateInventoryAdjustmentPayload = {
+  product_id: number;
+  warehouse_id: number;
+  transaction_type: string;
+  quantity: number;
+  note: string;
+};