From e8827694f5d884214ac93f42d5420397d4b5a5dc Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 20 Jun 2017 11:54:37 +0530 Subject: [PATCH] fixed service and revenue po --- application/controllers/servicepurchaseorder.php | 11 ++++++++++- application/logs/log-2017-06-19.php | 0 application/logs/log-2017-06-20.php | 14 ++++++++++++++ application/views/purchaseorder.php | 13 ++++++++----- application/views/servicePurchaseorder.php | 1 + 5 files changed, 33 insertions(+), 6 deletions(-) mode change 100644 => 100755 application/logs/log-2017-06-19.php create mode 100644 application/logs/log-2017-06-20.php diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index 72dbcade..95785403 100755 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -71,6 +71,15 @@ class servicepurchaseorder extends BaseController $DeliveryAddr = $this->input->post('DeliveryAddr'); $dt = $this->input->post('Deliverydt'); $Deliverydt = $this->getDateformat($dt); + $DeliveryOption = $this->input->post('DateRange'); + if($DeliveryOption==1){ + $Deliverydt = ''; + $DeliverySchedule = $this->input->post('Scheduleby'); + } + else{ + $Deliverydt = $this->getDateformat($dt); + $DeliverySchedule = ''; + } $POType = $this->input->post('POType'); $SpcialInstruction = $this->input->post('txtSpcialInstruction'); @@ -86,7 +95,7 @@ class servicepurchaseorder extends BaseController $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $createddt = $dt->format('Y-m-d H:i:s'); // PO Master - $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt ); + $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt ); $POMaster = $this->purchaseorder_model->addPOMaster($POList); diff --git a/application/logs/log-2017-06-19.php b/application/logs/log-2017-06-19.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-06-20.php b/application/logs/log-2017-06-20.php new file mode 100644 index 00000000..7d6a9b96 --- /dev/null +++ b/application/logs/log-2017-06-20.php @@ -0,0 +1,14 @@ + + +ERROR - 2017-06-20 07:09:20 --> Severity: Notice --> Undefined variable: RequistionDetails /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 138 +ERROR - 2017-06-20 07:09:20 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 139 +ERROR - 2017-06-20 07:09:20 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 140 +ERROR - 2017-06-20 07:09:20 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 186 +ERROR - 2017-06-20 07:09:20 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 214 +ERROR - 2017-06-20 07:18:29 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/Git_Server/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38 +ERROR - 2017-06-20 08:15:30 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/Git_Server/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38 +ERROR - 2017-06-20 08:16:37 --> Severity: Notice --> Undefined variable: RequistionDetails /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 138 +ERROR - 2017-06-20 08:16:37 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 139 +ERROR - 2017-06-20 08:16:37 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 140 +ERROR - 2017-06-20 08:16:37 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 186 +ERROR - 2017-06-20 08:16:37 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 214 diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php index 6ba56270..fc2d8e06 100755 --- a/application/views/purchaseorder.php +++ b/application/views/purchaseorder.php @@ -409,7 +409,7 @@ $('#txtEditExciseDuty').change(function() { $('#txtVat').change(function() { if($('#Rate').val() != '' && $('#MaterialCode').val() != "0" ) { - $('#VatCalModel').modal('show'); + //$('#VatCalModel').modal('show'); } @@ -418,7 +418,7 @@ $('#txtEditVat').change(function() { if($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0" ) { - $('#VatCalModel').modal('show'); + //$('#VatCalModel').modal('show'); } }); @@ -426,7 +426,7 @@ $('#txtEditVat').change(function() { $('#txtCST').change(function() { if($('#Rate').val() != '' && $('#MaterialCode').val() != "0" ) { - $('#CSTCalModel').modal('show'); + //$('#CSTCalModel').modal('show'); } }); @@ -434,7 +434,7 @@ $('#txtEditCST').change(function() { if($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0" ) { - $('#CSTCalModel').modal('show'); + //$('#CSTCalModel').modal('show'); } }); $('#drpFreight').change(function() { @@ -1509,6 +1509,9 @@ var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); else if(FreightType == '') { AfterFreight = ; + } + else { + AfterFreight = $("#txtEditFreight").val(); } var AfterFreightval = parseFloat(AfterFreight).toFixed(2); @@ -2190,7 +2193,7 @@ body {