diff --git a/app/Http/Resources/ContainerBaseResource.php b/app/Http/Resources/ContainerBaseResource.php
index d06627a8..3f203c34 100644
--- a/app/Http/Resources/ContainerBaseResource.php
+++ b/app/Http/Resources/ContainerBaseResource.php
@@ -46,7 +46,8 @@ class ContainerBaseResource extends JsonResource
             $item['include_shipping_transaction'] = false;
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
-            $item['include_receive_packing_list'] = true;
+            $item['include_receive_packing_list'] = false;
+            $item['include_base_only_in_receive_packing_list'] = true;
             $item['include_order_in_packages'] = false;
             $item['include_transport_in_packages'] = false;
             $item['include_container_in_packages'] = false;
diff --git a/app/Http/Resources/OrderPackagesBaseResource.php b/app/Http/Resources/OrderPackagesBaseResource.php
index 24be5cbb..5d8366bc 100644
--- a/app/Http/Resources/OrderPackagesBaseResource.php
+++ b/app/Http/Resources/OrderPackagesBaseResource.php
@@ -29,6 +29,7 @@ class OrderPackagesBaseResource extends JsonResource
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
             $item['include_receive_packing_list'] = true;
+            $item['include_base_only_in_receive_packing_list'] = false;
             $item['include_order_in_packages'] = true;
             $item['include_transport_in_packages'] = true;
             $item['include_container_in_packages'] = false;
@@ -41,6 +42,7 @@ class OrderPackagesBaseResource extends JsonResource
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
             $item['include_receive_packing_list'] = true;
+            $item['include_base_only_in_receive_packing_list'] = false;
             $item['include_order_in_packages'] = true;
             $item['include_transport_in_packages'] = false;
             $item['include_container_in_packages'] = true;
@@ -53,6 +55,7 @@ class OrderPackagesBaseResource extends JsonResource
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
             $item['include_receive_packing_list'] = false;
+            $item['include_base_only_in_receive_packing_list'] = false;
             $item['include_order_in_packages'] = true;
             $item['include_transport_in_packages'] = false;
             $item['include_container_in_packages'] = true;
@@ -65,6 +68,7 @@ class OrderPackagesBaseResource extends JsonResource
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
             $item['include_receive_packing_list'] = true;
+            $item['include_base_only_in_receive_packing_list'] = false;
             $item['include_order_in_packages'] = true;
             $item['include_transport_in_packages'] = false;
             $item['include_container_in_packages'] = false;
@@ -77,6 +81,7 @@ class OrderPackagesBaseResource extends JsonResource
             $item['include_suspended_invoice'] = false;
             $item['include_packages'] = true;
             $item['include_receive_packing_list'] = true;
+            $item['include_base_only_in_receive_packing_list'] = false;
             $item['include_order_in_packages'] = true;
             $item['include_transport_in_packages'] = true;
             $item['include_container_in_packages'] = false;
diff --git a/app/Http/Resources/PackingListBaseResource.php b/app/Http/Resources/PackingListBaseResource.php
index f6b140ad..a89c68ba 100644
--- a/app/Http/Resources/PackingListBaseResource.php
+++ b/app/Http/Resources/PackingListBaseResource.php
@@ -61,9 +61,36 @@ class PackingListBaseResource extends JsonResource
         $data['packages'] = PackageBaseResource::collection($packages);
 
 
-        //option 2: include_receive_packing_list
+        //option 2a: include_receive_packing_list
         if($this->include_receive_packing_list){
-            $receive_packing_list = $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListResource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first()));
+            $temp = PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first();
+            $temp->include_shipping_transaction = true;
+            $temp->include_suspended_invoice = true;
+            $temp->include_packages = true;
+            $temp->include_receive_packing_list = true;
+            $temp->include_transport_in_receive_packing_list = false;
+            $temp->include_order_in_packages = true;
+            $temp->include_transport_in_packages = true;
+            $temp->include_container_in_packages = true;
+            $temp->include_packing_list_reference_in_packages = true;
+
+            $receive_packing_list = $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListBaseResource($temp));
+        }
+
+        //option 2b: include_base_only_in_receive_packing_list
+        if($this->include_base_only_in_receive_packing_list){
+            $temp = PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first();
+            $temp->include_shipping_transaction = false;
+            $temp->include_suspended_invoice = false;
+            $temp->include_packages = false;
+            $temp->include_receive_packing_list = false;
+            $temp->include_transport_in_receive_packing_list = false;
+            $temp->include_order_in_packages = false;
+            $temp->include_transport_in_packages = false;
+            $temp->include_container_in_packages = false;
+            $temp->include_packing_list_reference_in_packages = false;
+
+            $receive_packing_list = $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListBaseResource($temp));
         }
         $data['receive_packing_list'] = $receive_packing_list;