diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php index 8df6beda..e3fe57d9 100755 --- a/application/views/AmendPOlist.php +++ b/application/views/AmendPOlist.php @@ -57,14 +57,19 @@ StatusName ?> DeliveryOption == 1){ - $option = "By Schedule" ; } + $option = "By Schedule" ; } + else if($record->DeliveryOption == 2){ + $option = "By Dispatch Instruction" ; + } echo $option ?> - DeliveryDate); + DeliveryOption == 0){ $Ddt = new DateTime($record->DeliveryDate); $Deliverydt = $Ddt->format('d-m-Y'); + echo $Deliverydt; + } - if($record->DeliveryOption == 1){$Deliverydt = '';} - echo $Deliverydt ?> + else if($record->DeliveryOption == 1){$Deliverydt = ''; + echo $Deliverydt; }?> DeliverySchedule ?> diff --git a/application/views/POlist.php b/application/views/POlist.php index 8bfd92d6..f2579d39 100755 --- a/application/views/POlist.php +++ b/application/views/POlist.php @@ -54,16 +54,21 @@ TotalOrderValue ?> StatusName ?> - DeliveryOption == 1){ - $option = "By Schedule" ; } + $option = "By Schedule" ; } + else if($record->DeliveryOption == 2){ + $option = "By Dispatch Instruction" ; + } echo $option ?> - DeliveryDate); + DeliveryOption == 0){ $Ddt = new DateTime($record->DeliveryDate); $Deliverydt = $Ddt->format('d-m-Y'); + echo $Deliverydt; + } - if($record->DeliveryOption == 1){$Deliverydt = '';} - echo $Deliverydt ?> + else if($record->DeliveryOption == 1){$Deliverydt = ''; + echo $Deliverydt; }?> DeliverySchedule ?> StatusCode; diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index f548c896..98c3d634 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -447,7 +447,7 @@ if(!empty($RequistionDetails)) - "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>     + "DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>     "DateRange", "id"=>"Schedule", "value"=>"1")); ?> diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index fd7f1c57..8279ccf9 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -460,7 +460,7 @@ if(!empty($RequistionDetails)) Select Delivery By
- "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>     + "DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>     "DateRange", "id"=>"Schedule", "value"=>"1")); ?> diff --git a/application/views/editstorerequisition.php b/application/views/editstorerequisition.php index 4f601905..b05115ed 100755 --- a/application/views/editstorerequisition.php +++ b/application/views/editstorerequisition.php @@ -466,7 +466,7 @@ $(function() { type: 'hidden', id: 'Quantity' + j, name: 'Quantity'+ j, - value:obj.Quantity + value:obj.QuantityRequired }).appendTo('form'); $('').attr({ diff --git a/application/views/importpo.php b/application/views/importpo.php index 4e194bab..374394f6 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -353,7 +353,7 @@ function vaildateBeforeOpenModal() Select Delivery By
- "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>     + "DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>     "DateRange", "id"=>"Schedule", "value"=>"1")); ?> diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php index 847af69b..c30df158 100755 --- a/application/views/storerequisition.php +++ b/application/views/storerequisition.php @@ -88,7 +88,7 @@ span.highlight { StatusName ?> ReqDate); -$ReqDate = $dt->format('d-m-y'); echo $ReqDate ?> +$ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?> Remarks ?>