diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index a81bf10d..84f13e1a 100755 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -132,6 +132,7 @@ class amendmentpurchaseorder extends BaseController // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate; $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency); $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); + $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR'); //print_r($data['PaymentTerms']); $unicode =''; foreach ($data['CurrencyDetail'] as $Detail) @@ -655,21 +656,40 @@ function UpdateAmendServicePurchaseOrder() $Deliverydt = $this->getDateformat($dt); $POType = $this->input->post('POType'); $PoRange = $this->input->post('txtPoRange'); - $DeliveryOption = $this->input->post('DateRange'); + //$DeliveryOption = $this->input->post('DateRange'); + $updatedBy = $this->session->userdata ( 'userId' ); + $Exchangerate=$this->input->post('ExchangeRate'); $ExchangeRateCalculatedon=$this->input->post('Exchangerateon'); $CurrencyType=$this->input->post('currencytype'); - + $DeliveryOption = $this->input->post('DateRange'); - if($DeliveryOption==1){ - $Deliverydt = ''; - $DeliverySchedule = $this->input->post('Scheduleby'); - } - else{ - $Deliverydt = $this->getDateformat($dt); - $DeliverySchedule = ''; - } + + $DeliverySchedule=''; + $Dispatch=''; + if($DeliveryOption==1) + { + $Dispatch=''; + $DeliverySchedule = $this->input->post('Scheduleby'); + } + + + else + { + $Dispatch = $this->input->post('Dispatch'); + $DeliverySchedule = ''; + } + + + // if($DeliveryOption==1){ + // $Deliverydt = ''; + // $DeliverySchedule = $this->input->post('Scheduleby'); + // } + // else{ + // $Deliverydt = $this->getDateformat($dt); + // $DeliverySchedule = ''; + // } $SpcialInstruction = $this->input->post('txtSpcialInstruction'); @@ -688,10 +708,15 @@ function UpdateAmendServicePurchaseOrder() $PaymentTerms=$this->input->post('PaymentTerms'); $Payableat=$this->input->post('PayableAT'); - echo $RowCount; + $Palaceoforigin=$this->input->post('PlaceOforigin'); + //echo $RowCount; // PO Master // PO Master - $POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt); + $POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin); + + + // $POList = array('SupplierID'=>$Supp,lierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin); + //print_r($POMaster); diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index d7e35f60..2d6259dc 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -7,6 +7,12 @@ $Rowcount = 0; $Value=$unicode; +$Import_DispatchDetails=''; +$Import_PlaceofOrgin=''; + +$DeliverySchedule=''; + + $Currencycode=$currencycode; $Cur = ''; $CurCode= ''; @@ -37,6 +43,18 @@ if(!empty($MaxPODate)) } +$INR=''; +if(!empty($INRSYMBOL)) +{ + foreach ($INRSYMBOL as $INR) + { + $INR=$INR->Currency_Code; + // $INR=$INR->FontCode2000; + } +} +//echo $INR; + + $CompanyAddress = ''; if(!empty($CompanyDetails)) @@ -103,6 +121,10 @@ if(!empty($POMaster)) $PaymentDays=$Req->PaymentDays; $StatusName=$Req->StatusName; + $Import_DispatchDetails=$Req->Import_DispatchDetails; + $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; + $DeliverySchedule=$Req->DeliverySchedule; + } } @@ -183,10 +205,10 @@ body { }); - $("#Deliverydt").datepicker({ - minDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' - }); + // $("#Deliverydt").datepicker({ + // minDate : 'now', + // dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + // }); $("#Requeston").datepicker({ //minDate : d, @@ -337,7 +359,7 @@ body {
-
+ + +
+
+ +
+ + 'POType','value' => set_value('POType',IMPORT),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+
@@ -374,7 +418,10 @@ body { Select Delivery By
- "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>     + + + + "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>     "DateRange", "id"=>"Schedule", "value"=>"1")); ?> @@ -383,20 +430,35 @@ body {

- + + + + + + 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); ?>
@@ -431,11 +493,15 @@ body {
- +
'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - echo form_input($data); + // $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + // echo form_input($data); + + $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin',$Import_PlaceofOrgin),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?>
@@ -619,7 +685,7 @@ body { -

+

@@ -666,10 +732,11 @@ body {
- Basic Price: + +
-
+
- Landing charge + +
@@ -711,7 +779,8 @@ body {
- High seas sales charge + +
@@ -732,7 +801,8 @@ body {
- Custom duty : (a) + +
@@ -753,7 +823,8 @@ body {
- Excise duty : (b) + +
@@ -774,7 +845,8 @@ body {
- Excise duty ED_cess : (C) + +
@@ -795,7 +867,8 @@ body {
- Excise duty S & H cess :(d) + +
@@ -816,7 +889,8 @@ body {
- Custom ED_cess : (e) + +
@@ -837,7 +911,8 @@ body {
- Custom S & H cess : (f) + +
@@ -860,7 +935,8 @@ body {
- Additional Excise duty : (g) + +
@@ -881,7 +957,8 @@ body {
- Gross duty payable + +
@@ -894,7 +971,8 @@ body {
- Available Modvat set-off on import : + +
@@ -909,7 +987,8 @@ body {
- Gross expenses due to custom duty: + +
@@ -927,7 +1006,7 @@ body {
- purchase rate [Basic] + purchase rate [Basic]/UOM
@@ -951,7 +1030,8 @@ body {
- Custom Duty Expenses + +
@@ -965,7 +1045,8 @@ body {
- RMC Including Customers + +
@@ -975,11 +1056,11 @@ body { ?>
-
- Total Amount: +
-
+