diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 65fcef0c4..d9948a67d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -95,7 +95,7 @@
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
                                                         <!-- <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed"  > -->
-                                                            <mat-select placeholder="Finished Goods" formControlName="goods_observed"  >
+                                                            <mat-select placeholder="Stock" formControlName="goods_observed"  >
                                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                                 <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
@@ -166,7 +166,7 @@
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"   >
+                                                        <mat-select placeholder="Stock" formControlName="traded_goods_observed"   >
                                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                                 <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
@@ -250,7 +250,7 @@
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="Finished Goods" formControlName="goods_observed"  >
+                                                        <mat-select placeholder="Stock" formControlName="goods_observed"  >
                                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                                 <mat-option value="no">No stock observed</mat-option>
                                                         </mat-select>
@@ -322,7 +322,7 @@
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"  >
+                                                        <mat-select placeholder="Stock" formControlName="traded_goods_observed"  >
                                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                                 <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
@@ -407,7 +407,7 @@
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="Finished Goods" formControlName="goods_observed"   >
+                                                        <mat-select placeholder="Stock" formControlName="goods_observed"   >
                                                                 <mat-option value="yes">Add Stock Details</mat-option>
                                                                 <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
@@ -481,7 +481,7 @@
                                                                 <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                             </mat-form-field>
                                                             <mat-form-field style="width:30%">
-                                                               <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"  >
+                                                               <mat-select placeholder="Stock" formControlName="traded_goods_observed"  >
                                                                <mat-option value="yes">Add Stock Details</mat-option>
                                                                <mat-option value="no">No stock observed</mat-option>
                                                                </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index fcffdb83f..4b23b98ec 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -55,6 +55,8 @@ export class StockComponent implements OnInit {
   noRecordsFound: Boolean = false;
   serviceProviderForm: Boolean = false;
   suppliers_raw_materials : any = [];
+  suppliers_trade_details : any = [];
+  suppliers_finished_goods : any =[];
 
   constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
               private router: Router,
@@ -65,6 +67,7 @@ export class StockComponent implements OnInit {
                   this.company_id = this.pd_all_details.company_id
                   this.notifier = notifier;
   }
+
   public viewerOptions: any = {
                                 navbar: false,
                                 toolbar: {
@@ -84,6 +87,7 @@ export class StockComponent implements OnInit {
                                   flipVertical: 4,
                                 }
                               };
+
   ngOnInit() {
 
       // this._pd.stockFormsAccess({pd_id:this.pdid}).subscribe(data => {
@@ -140,7 +144,7 @@ export class StockComponent implements OnInit {
                     trade_details: this.fb.array([this.tradingFormCreation(record)]),
                   });
                   
-                  let arr = record.filter(data => data.type_of_activity_id == 1);
+                  let arr = record.filter(data => data.type_of_activity_id == 2);
                   if(arr.length > 0) {
                     this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
                       // console.log('136',value);
@@ -201,7 +205,7 @@ export class StockComponent implements OnInit {
                     
                   }
 
-                  let arr1 = record.filter(data => data.type_of_activity_id == 2);
+                  let arr1 = record.filter(data => data.type_of_activity_id == 3);
                   if(arr1.length > 0) {
                     // let retail_finished_goods;
                     // let retail_traded_goods;
@@ -228,15 +232,34 @@ export class StockComponent implements OnInit {
                   // console.log(dataForm.retail_finished_goods);
                   // console.log(dataForm.retail_traded_goods);
 
-                    let retail_temparr = [];
-                    retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
-                    retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
-                    this.initRetailDetails(retail_temparr);
+                  this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                    // console.log('136',value);
+                    if(value.status == 200){
+                      // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;                        
+                      this.suppliers_finished_goods = value.records.trade_details[0].trading_products; 
+                      // this.suppliers_trade_details = value.records.trade_details[0].trading_products;
+                          let retail_temparr = [];
+                          retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
+                          retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
+                          this.initRetailDetails(retail_temparr);
+                      }
+                      else{
+                        let retail_temparr = [];
+                        retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
+                        retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
+                        this.initRetailDetails(retail_temparr);
+                      }
+                  });
+
+                    // let retail_temparr = [];
+                    // retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
+                    // retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
+                    // this.initRetailDetails(retail_temparr);
                     //this.initRetailDetails(dataForm);
                     //this.initRetailDetails(null);
                   }
 
-                  let arr2 = record.filter(data => data.type_of_activity_id == 3);
+                  let arr2 = record.filter(data => data.type_of_activity_id == 4);
                   if(arr2.length > 0) {
                     // let trading_finished_goods;
                     // let trading_traded_goods;
@@ -260,13 +283,33 @@ export class StockComponent implements OnInit {
                     //   })
                     // }
 
-                    let trading_temparr = [];
-                    trading_temparr['trading_finished_goods'] =  dataForm.trade_details[0].trading_finished_goods;
-                    trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
-                    //this.initTradingDetails(trading_temparr);
-                    this.initTradingDetails(trading_temparr);
+                    // let trading_temparr = [];
+                    // trading_temparr['trading_finished_goods'] =  dataForm.trade_details[0].trading_finished_goods;
+                    // trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
+                    // //this.initTradingDetails(trading_temparr);
+                    // this.initTradingDetails(trading_temparr);
+
+                    this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                      // console.log('136',value);
+                      if(value.status == 200){
+                        // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;                        
+                          this.suppliers_trade_details = value.records.trade_details[0].trading_products;
+                          let trading_temparr = [];
+                          trading_temparr['trading_finished_goods'] =  dataForm.trade_details[0].trading_finished_goods;
+                          trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
+                          this.initTradingDetails(trading_temparr);
+                        }
+                        else{
+                          let trading_temparr = [];
+                          trading_temparr['trading_finished_goods'] =  dataForm.trade_details[0].trading_finished_goods;
+                          trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
+                          //this.initTradingDetails(trading_temparr);
+                          this.initTradingDetails(trading_temparr);
+                        }
+                    });
+
                   }
-                  let arr3 = record.filter(data => data.type_of_activity_id == 4);
+                  let arr3 = record.filter(data => data.type_of_activity_id == 5);
                 if(arr3.length > 0) {
                this.serviceProviderForm = true;
               }
@@ -298,11 +341,35 @@ export class StockComponent implements OnInit {
                     }
                     let arr1 = record.filter(data => data.type_of_activity_id == 2);
                     if(arr1.length > 0) {
-                      this.initRetailDetails(null);
+
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+                          this.suppliers_finished_goods = value.records.trade_details[0].trading_products;
+                          //trade_product_name;
+                          this.initRetailDetails(null);
+                          }
+                          else{
+                            this.initRetailDetails(null);
+                          }
+                      });
+
+                      
                     }
                     let arr2 = record.filter(data => data.type_of_activity_id == 3);
                     if(arr2.length > 0) {
-                      this.initTradingDetails(null);
+                      // this.initTradingDetails(null);
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+                          // this.suppliers_finished_goods 
+                          this.suppliers_trade_details = value.records.trade_details[0].trading_products;
+                          this.initTradingDetails(null);
+                          }
+                          else{
+                            this.initTradingDetails(null);
+                          }
+                      });
                     }
                     let arr3 = record.filter(data => data.type_of_activity_id == 4);
                     if(arr3.length > 0) {
@@ -331,15 +398,33 @@ export class StockComponent implements OnInit {
                             this.initManufacturingDetails(null);     
                           }
                       });
-                      
                     }
                     let arr1 = record.filter(data => data.type_of_activity_id == 2);
                     if(arr1.length > 0) {
-                      this.initRetailDetails(null);
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          this.suppliers_finished_goods = value.records.trade_details[0].trading_products;
+                          // value.records.manufacturing_details[0].main_raw_materials;
+                          this.initRetailDetails(null);
+                          }
+                          else{
+                            this.initRetailDetails(null);
+                          }
+                      });
+                      
                     }
                     let arr2 = record.filter(data => data.type_of_activity_id == 3);
                     if(arr2.length > 0) {
-                      this.initTradingDetails(null);
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          this.suppliers_trade_details = value.records.trade_details[0].trading_products;
+                          this.initTradingDetails(null);
+                          }
+                          else{
+                            this.initTradingDetails(null);
+                          }
+                      });
+                      // this.initTradingDetails(null);
                     }
                     let arr3 = record.filter(data => data.type_of_activity_id == 4);
                     if(arr3.length > 0) {
@@ -432,8 +517,42 @@ tradingFormCreation(val) {
         else{      
          rawMaterial.push(this.createRawmaterial(null)); 
         }
-         finishedGoods.push(this.createGoods(null)); 
-         tradedGoods.push(this.createTradedGoods(null));     
+        if(this.suppliers_finished_goods.length > 0){
+          for (let val of this.suppliers_finished_goods) {
+            let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
+                                          'goods_observed': '',
+                                          'goods_quantity': '',
+                                          'goods_uom': '',
+                                          'goods_other_uom': '',
+                                          'goods_value': '',
+                                          'is_sufficiant_goods': '',
+                                          'finishedgoods_remarks':''};
+              finishedGoods.push(this.createGoods(Ref_Finished_Goods));     
+            // finishedGoods.push(this.createGoods(null));     
+          }
+        }
+        else{      
+          finishedGoods.push(this.createGoods(null));       
+        }
+
+        if(this.suppliers_trade_details.length > 0){
+          for (let val of this.suppliers_trade_details) {
+            let Ref_Trade_Goods : any = {
+              'traded_goods_name': val.trade_product_name,
+              'traded_goods_observed': '',
+              'traded_goods_quantity': '',
+              'traded_goods_uom': '',
+              'traded_goods_other_uom': '',
+              'estimated_traded_goods_value': '',
+              'is_sufficiant_traded_goods': '',
+              'traded_goods_remarks':''};
+            tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));     
+          }
+        }
+        else{      
+          tradedGoods.push(this.createTradedGoods(null));     
+        }
+
        } else {
         //  console.log(305,'else')
         //  console.log(377,datas);
@@ -522,8 +641,42 @@ tradingFormCreation(val) {
       
       if(datas === null){
 
-         finishedGoods.push(this.createGoods(null)); 
-         tradedGoods.push(this.createTradedGoods(null));     
+        //  finishedGoods.push(this.createGoods(null)); 
+         if(this.suppliers_finished_goods.length > 0){
+          for (let val of this.suppliers_finished_goods) {
+            let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
+                                          'goods_observed': '',
+                                          'goods_quantity': '',
+                                          'goods_uom': '',
+                                          'goods_other_uom': '',
+                                          'goods_value': '',
+                                          'is_sufficiant_goods': '',
+                                          'finishedgoods_remarks':''};
+            finishedGoods.push(this.createGoods(Ref_Finished_Goods)); 
+          }
+        }
+        else{      
+          finishedGoods.push(this.createGoods(null));     
+        }
+
+        if(this.suppliers_trade_details.length > 0){
+          console.log(this.suppliers_trade_details);
+          for (let val of this.suppliers_trade_details) {
+            let Ref_Trade_Goods : any = {
+              'traded_goods_name': val.trade_product_name,
+              'traded_goods_observed': '',
+              'traded_goods_quantity': '',
+              'traded_goods_uom': '',
+              'traded_goods_other_uom': '',
+              'estimated_traded_goods_value': '',
+              'is_sufficiant_traded_goods': '',
+              'traded_goods_remarks':''};
+            tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));     
+          }
+        }
+        else{      
+          tradedGoods.push(this.createTradedGoods(null));     
+        }
 
        } else {
         //console.log(479,datas.retail_finished_goods);
@@ -624,8 +777,42 @@ tradingFormCreation(val) {
       
       if(datas === null){
 
-         finishedGoods.push(this.createGoods(null)); 
-         tradedGoods.push(this.createTradedGoods(null));     
+        //  finishedGoods.push(this.createGoods(null)); 
+        //  tradedGoods.push(this.createTradedGoods(null));
+        if(this.suppliers_finished_goods.length > 0){
+          for (let val of this.suppliers_finished_goods) {
+            let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
+                                          'goods_observed': '',
+                                          'goods_quantity': '',
+                                          'goods_uom': '',
+                                          'goods_other_uom': '',
+                                          'goods_value': '',
+                                          'is_sufficiant_goods': '',
+                                          'finishedgoods_remarks':''};
+            finishedGoods.push(this.createGoods(Ref_Finished_Goods)); 
+          }
+        }
+        else{      
+          finishedGoods.push(this.createGoods(null));     
+        }
+        
+        if(this.suppliers_trade_details.length > 0){
+          for (let val of this.suppliers_trade_details) {
+            let Ref_Trade_Goods : any = {
+              'traded_goods_name': val.trade_product_name,
+              'traded_goods_observed': '',
+              'traded_goods_quantity': '',
+              'traded_goods_uom': '',
+              'traded_goods_other_uom': '',
+              'estimated_traded_goods_value': '',
+              'is_sufficiant_traded_goods': '',
+              'traded_goods_remarks':''};
+            tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));     
+          }
+        }
+        else{      
+          tradedGoods.push(this.createTradedGoods(null));     
+        }
 
        } else {
         //  for (let val of datas) {