diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index cdd66233..2fdbae6c 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -226,7 +226,7 @@ class amendmentpurchaseorder extends BaseController
}
- function EditRevenuePurchaseOrder()
+ function EditRevenuePurchaseOrder()
{
$NewPO='';
$MAD='';
@@ -261,25 +261,27 @@ class amendmentpurchaseorder extends BaseController
$POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange');
+ $PaymentTermsText=$this->input->post('beforePaymentTermsText');
$PaymentTerms=$this->input->post('PaymentTerms');
$prePaymentTerms=$this->input->post('beforePaymentTerms');
+ $testdate=date("Y-m-d");
if($PaymentTerms!=$prePaymentTerms)
{
- $MAD="Amended PaymentTerms : ". $prePaymentTerms ."
";
+ $MAD.="Amended PaymentTerms : ". $PaymentTermsText ."
";
}
- if(($dt) != ($predeliverydate))
+ if(($predeliverydate != $testdate)&&($dt) != ($predeliverydate))
{
- $predeliverydate = $this->getDateformat($dt);
+ //$predeliverydate = $this->getDateformat($dt);
$MAD.='Amended Delivery Date : ' . $predeliverydate . '
' ;
}
if($DeliverySchedule != $preschedule)
{
$MAD.="Amended Schedule : " . $preschedule."
";
}
-
-
+ // echo "MAD is:" . $MAD;
+ // die();
$SpecialInstruction = $this->input->post('txtSpcialInstruction');//$_POST['txtSpcialInstruction'];//$this->input->post('txtSpcialInstruction');//t->post('txtSpcialInstruction'));
// echo $SpecialInstruction;
@@ -297,7 +299,8 @@ class amendmentpurchaseorder extends BaseController
// PO Master
// PO Master
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'AmendedDetails'=>$MAD);
- //print_r($POMaster);
+ // print_r($POMaster);
+ // die();
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO);
@@ -369,7 +372,7 @@ class amendmentpurchaseorder extends BaseController
if(($Quantity-$preqty)!=0)
{
$rowspanvalue++;
- $CAD="| Amended Quantity : ".$preqty ." | Current Qty:".$Quantity." |
";
+ $CAD.="| Amended Quantity : ".$preqty ." | Current Qty:".$Quantity." |
";
}
if(($itemRate-$preitemrate)!=0)
{
@@ -379,7 +382,7 @@ class amendmentpurchaseorder extends BaseController
if(($DiscountValue-$preDiscountValue)!=0)
{
$rowspanvalue++;
- $CAD.="| Amended Discount:". $preDiscountValue ." | Current Discount Value:".$itemRate." |
";
+ $CAD.="| Amended Discount:". $preDiscountValue ." | Current Discount Value:".$DiscountValue." |
";
}
if(($PackagingValue-$prePackagingValue)!=0)
{
@@ -477,12 +480,17 @@ function UpdateAmendServicePurchaseOrder()
}
$ddate=$this->input->post('Deliverydt');
+ //echo "current Date is:-" . $ddate . "
";
$beforeddate=$this->input->post('beforeDeliverydt');
-
+ //echo $beforeddate."
";
+ $testdate=date("Y-m-d");
+ //echo "Today date:-" . $testdate ."
";
$dschedule=$this->input->post('Scheduleby');
+ //echo "$dschedule";
$beforedschedule=$this->input->post('beforeScheduleby');
+ //echo "beforedate is:-" . $beforeddate;
- if($ddate != $beforeddate)
+ if(($beforeddate != $testdate) && ($ddate != $beforeddate))
{
$MAD.="Amended Delivery Date : " . $beforeddate . "
";
}
@@ -491,6 +499,8 @@ function UpdateAmendServicePurchaseOrder()
{
$MAD.="Amended Delivery Schedule : " . $beforedschedule . "
";
}
+ // echo "MAD IS:-".$MAD;
+ // die();
// if(($ddate != $beforeddate) || ($dschedule != $beforedschedule) )
// {
// $beforeddate2=new DateTime($beforeddate, new DateTimeZone('Asia/Kolkata'));
@@ -501,12 +511,12 @@ function UpdateAmendServicePurchaseOrder()
// $MAD.="Amended Delivery Option : " . $beforeddate ."".$beforedschedule. "
";
// }
-
+ $PaymentTermsText=$this->input->post('beforePaymentTermsText');
$PaymentTerms=$this->input->post('PaymentTerms');
$beforePaymentTerms=$this->input->post('beforePaymentTerms');
if($PaymentTerms != $beforePaymentTerms)
{
- $MAD.="Amended PaymentTerms : ". $beforePaymentTerms ."
";
+ $MAD.="Amended PaymentTerms : ". $PaymentTermsText ."
";
}
//echo "MAD IS" . $MAD . "
";
@@ -527,7 +537,8 @@ function UpdateAmendServicePurchaseOrder()
// PO Master
$POMaster = array('ParentPO'=>$PONO,'POType'=>$POType,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$scopeofwork,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
- //print_r($POMaster);
+ // print_r($POMaster);
+ // die();
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO);
//print_r($LastPO);
@@ -599,17 +610,17 @@ function UpdateAmendServicePurchaseOrder()
if(($SGST != $beforeSGST) && ($AfterSGST != $beforeSGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended SGST : " . $beforeSGST ." | Current SGST : " . $SGST . " |
| Amended SGST value : " . $beforeSGSTvalue ." | Current SGST value: " . $AfterSGST . " |
";
+ $CAD.="| Amended SGST% : " . $beforeSGST ." | Current SGST% : " . $SGST . " |
| Amended SGST value : " . $beforeSGSTvalue ." | Current SGST value: " . $AfterSGST . " |
";
}
if(($CGST != $beforeCGST) && ($AfterCGST != $beforeCGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended CGST : " . $beforeCGST ." | Current CGST : " . $CGST . " |
| Amended CGST value : " . $beforeCGSTvalue ." | Current CGST value: " . $AfterCGST . " |
";
+ $CAD.="| Amended CGST% : " . $beforeCGST ." | Current CGST% : " . $CGST . " |
| Amended CGST value : " . $beforeCGSTvalue ." | Current CGST value: " . $AfterCGST . " |
";
}
if(($IGST != $beforeIGST) && ($AfterIGST != $beforeIGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended IGST : " . $beforeIGST ." | Current IGST : " . $IGST . " |
| Amended IGST value : " . $beforeIGSTvalue ." | Current IGST value: " . $AfterIGST . " |
";
+ $CAD.="| Amended IGST% : " . $beforeIGST ." | Current IGST% : " . $IGST . " |
| Amended IGST value : " . $beforeIGSTvalue ." | Current IGST value: " . $AfterIGST . " |
";
}
if($otherallowance != $beforeotherallowance)
{
@@ -682,13 +693,15 @@ function UpdateAmendServicePurchaseOrder()
$curdispatch=$this->input->post('Dispatch');
$PaymentMethod = $this->input->post('PaymentMethod');
$prePaymentmethod=$this->input->post('beforePaymentmethod');
+ $prePaymentmethodtext=$this->input->post('beforePaymentTermsText');
+
$DeliverySchedule = $this->input->post('Scheduleby');
$preDeliverySchedule = $this->input->post('beforeSchedule');
$PlaceOforigin = $this->input->post('PlaceOforigin');
if($PaymentMethod != $prePaymentmethod)
{
- $MAD.="Amended Paymemnt Terms : " .$prePaymentmethod."
";
+ $MAD.="Amended Paymemnt Terms : " .$prePaymentmethodtext."
";
}
if($predispatch != $curdispatch)
{
@@ -733,8 +746,8 @@ function UpdateAmendServicePurchaseOrder()
$updateddt = $dt->format('Y-m-d H:i:s');
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'POType'=>$POType,'PODate'=>$PODate,'Status'=>PO_RELEASED,'CapitalRange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'AmendedDetails'=>$MAD,'Import_DispatchDetails'=>$curdispatch,'Import_PlaceofOrgin'=>$PlaceOforigin);
- //print_r($POMaster);
-
+ // print_r($POMaster);
+ // die();
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$CreateBy,$PONO);
foreach($LastPO as $PO):
@@ -840,17 +853,17 @@ function UpdateAmendServicePurchaseOrder()
if(($SGST != $preSGST) && ($SGSTvalue != $preSGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended SGST : " . $preSGST ." | Current SGST : " . $SGST . " |
| Amended SGST value : " . $preSGSTvalue ." | Current SGST value: " . $SGSTvalue . " |
";
+ $CAD.="| Amended SGST% : " . $preSGST ." | Current SGST% : " . $SGST . " |
| Amended SGST value : " . $preSGSTvalue ." | Current SGST value: " . $SGSTvalue . " |
";
}
if(($CGST != $preCGST) && ($CGSTvalue != $preCGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended CGST : " . $preCGST ." | Current CGST : " . $CGST . " |
| Amended CGST value : " . $preCGSTvalue ." | Current CGST value: " . $CGSTvalue . " |
";
+ $CAD.="| Amended CGST% : " . $preCGST ." | Current CGST% : " . $CGST . " |
| Amended CGST value : " . $preCGSTvalue ." | Current CGST value: " . $CGSTvalue . " |
";
}
if(($IGST != $preIGST) && ($IGSTvalue != $preIGSTvalue))
{
$rowspanvalue+=2;
- $CAD.="| Amended IGST : " . $preIGST ." | Current IGST : " . $IGST . " |
| Amended IGST value : " . $preIGSTvalue ." | Current IGST value: " . $IGSTvalue . " |
";
+ $CAD.="| Amended IGST% : " . $preIGST ." | Current IGST% : " . $IGST . " |
| Amended IGST value : " . $preIGSTvalue ." | Current IGST value: " . $IGSTvalue . " |
";
}
if($otherallowance != $preotherallowance)
{
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 435dbf07..6fabc042 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -625,15 +625,17 @@ function purchaseorderListing($forwhat='')
- $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ServiceMaterialDescription,ReqNo,Mat.MaterialCode,Mat.MaterialName,
- Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
- ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as Taxamount ,
- TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address
+ $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,
+ Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
+ ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST + Tax.otherallowance) ,2)as Taxamount,ReqMat.NumberOfService,
+ TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentTerms
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
+ join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
+ join T_Requestion_Master ReqMat on ReqMat.ReqNo = LineItem.ReqNo
where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
@@ -696,12 +698,13 @@ function purchaseorderListing($forwhat='')
Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,
ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST +
AfterIGST + Insurance)) ,2)as Taxamount,
- TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend
+ TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
+ join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
@@ -869,8 +872,8 @@ QuantityRejected,ROUND(ReceivedQuantity-QuantityRejected)as PendingQty,
{
//echo $PONO;
- $subQuery ='SELECT distinct LineItem.PONO,LineItem.AmendedDetails as lineamd,LineItem.LineItemNo,SUP.SupplierName,SUP.Address,POMast.DeliveryAddress,POMast.DeliveryDate,POMast.PODate,POMast.DeliveryOption,POMast.ServiceDescription,POMast.PaymentTerms,POMast.Import_PlaceofOrgin,POMast.AmendedDetails,POMast.PaymentDays,POMast.DeliverySchedule,POMast.TotalOrderValue,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,Rate,Req.Status,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,POMast.CurrencyType,
+ $subQuery ='SELECT distinct LineItem.PONO,LineItem.AmendedDetails as lineamd,LineItem.LineItemNo,SUP.SupplierName,SUP.Address,POMast.DeliveryAddress,POMast.DeliveryDate,POMast.PODate,POMast.DeliveryOption,POMast.ServiceDescription,POMast.Import_PlaceofOrgin,POMast.AmendedDetails,POMast.PaymentDays,POMast.DeliverySchedule,POMast.TotalOrderValue,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
+Mat.UOM,Quantity,Rate,Req.Status,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,POMast.CurrencyType,Payment.PaymentTerms,
Req.CostCenterCode FROM T_PurchaseOrder_LineItem LineItem
join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
join T_SupplierDetailsN SUP on SUP.SupplierID=POMast.SupplierID
@@ -878,6 +881,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
+ join T_PaymentTerms Payment on Payment.PaymentID = POMast.PaymentTerms
join T_Employee_Details emp on Req.Requestedby = emp.EmpID where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
//print_r ($query->result());
diff --git a/application/views/Amendervicepopdf.php b/application/views/Amendervicepopdf.php
index 98c161fa..7b544129 100644
--- a/application/views/Amendervicepopdf.php
+++ b/application/views/Amendervicepopdf.php
@@ -193,7 +193,7 @@
foreach($POItem as $record)
{
$index = $index + 1;
- $TotalAmount = $record->BasicValue + $record->Taxamount + $record->otherallowance;
+ $TotalAmount = ($record->BasicValue*$record->NumberOfService) + $record->Taxamount + $record->otherallowance;
?>
|
@@ -202,7 +202,7 @@
Quantity ; ?> |
UOM ; ?> |
Rate ; ?> |
- BasicValue ; ?> |
+ BasicValue * $record->NumberOfService) ; ?> |
After_SGST ; ?> |
After_CGST ; ?> |
After_IGST ; ?> |
@@ -269,10 +269,10 @@
Total Amount In Words
|
- Total Amount Before Tax In INR - |
+ Total Amount Before Tax In INR - |
- | Total Tax Amount In INR - |
+ Total Tax Amount In INR - |
| Total Amount After Tax In INR - |
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index 82567688..d66f7d6e 100644
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -156,13 +156,13 @@ if(!empty($AvlBudAmt))
\ No newline at end of file
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 31a2291b..088f2418 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -60,9 +60,10 @@ if(!empty($POMaster))
$PODate = $pdt->format('Y-m-d');
$DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule;
+ echo "*" . $Req->DeliveryDate . "*";
$Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d');
-
+ echo "-" . $Deliverydt . "-";
$DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode;
$PONO = $Req->PONO;
@@ -123,7 +124,9 @@ foreach ($PaymentTerms as $TER)
tinymce.init({
selector: "textarea#txtSpcialInstruction",
-
+ menubar: false,
+ statusbar: false,
+ toolbar: false,
plugins: "link image"
});
var DelOpt = '';
@@ -149,10 +152,16 @@ $('#Scheduleby').val(SchName);
+
+
+
+
+//