SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log

Browse Source
This commit is contained in:
venbatechnologies 2018-05-17 10:57:16 +05:30
parent 9e356ffcc4
commit ece513a15b
11 changed files with 443 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
application/controllers/emergencypurchaseorder.php
View File

@ -377,8 +377,8 @@ function addfile1()
}
/*----------------------------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$this->purchaseorder_model->newlogpo($logpo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $this->purchaseorder_model->newlogpo($logpo);
@ -620,9 +620,9 @@ $RequestedBy = $this->input->post('drpDepartment');
//echo $LineItemNo;
/*----------------------------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$logaddpo = $this->purchaseorder_model->newlogpo($logpo);
// $logaddpo = $this->purchaseorder_model->newlogpo($logpo);
@ -1330,9 +1330,9 @@ $RequestedBy = $this->input->post('drpDepartment');
}
//echo $LineItemNo;
/*--------------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$Rate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$Rate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$addlog= $this->purchaseorder_model->newlogpo($logpo);
// $addlog= $this->purchaseorder_model->newlogpo($logpo);
/*--------------*/
if(trim($POType) == REVENUE )
{
@ -1351,12 +1351,16 @@ $RequestedBy = $this->input->post('drpDepartment');
//This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder()
{
// echo "hi"; die;
$PONO =$this->input->post('txtPONO');
$POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier');
$newsup=$this->input->post('newsup');
$newSupId = split("[ - ]+", $newsup);
/*-----------------------------------*/
$b4supplier=$this->input->post('b4supplier');
$b4date=$this->input->post('b4podate');
@ -1388,7 +1392,20 @@ $RequestedBy = $this->input->post('drpDepartment');
$LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate )
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4podate,'newValue'=>$PODate,'entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4supplier,'newValue'=>$newsup,'entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
//echo $RowCount;
for ($i = 1; $i <= $RowCount; $i++)
@ -1432,17 +1449,32 @@ $RequestedBy = $this->input->post('drpDepartment');
$CostCenter = $this->input->post('costCode'.$i);
$LineItemNo = '';
if($Quantity != $b4qty)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4qty,'newValue'=>$Quantity,'entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4rate,'newValue'=>$itemRate,'entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
/*---------start---------------------*/
if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
($Quantity != $b4qty ))
{
$logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
// if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
// ($Quantity != $b4qty ))
// {
// $logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
}
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
/*----------end--------------------*/

180
application/controllers/purchaseorder.php
View File

@ -1166,9 +1166,9 @@ function edited(){
}
//echo $LineItemNo;
/*---------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$addlog= $this->purchaseorder_model->newlogpo($logpo);
// $addlog= $this->purchaseorder_model->newlogpo($logpo);
/*---------*/
if(trim($POType) == REVENUE )
{
@ -1193,6 +1193,11 @@ function edited(){
$POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier');
$newsup=$this->input->post('newsup');
$newSupId = split("[ - ]+", $newsup);
$DeliveryAddr = $this->input->post('txtDeliveryAddress');
$dt = $this->input->post('Deliverydt');
//$Deliverydt = $this->getDateformat($dt);
@ -1257,7 +1262,21 @@ function edited(){
$LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate )
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4podate,'newValue'=>$PODate,'entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4supplier,'newValue'=>$newsup,'entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
//echo "OUT";
for ($i = 1; $i <= $RowCount; $i++)
{
@ -1295,15 +1314,44 @@ function edited(){
$LineItemNo = '';
/*---------start---------------------*/
if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
($Quantity != $b4qty ))
if($Quantity != $b4qty)
{
$logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4qty,'newValue'=>$Quantity,'entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4rate,'newValue'=>$itemRate,'entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
// if($PODate != $b4podate )
// {
// $logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
}
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
// if($PODate != $b4podate )
// {
// $logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
// if($PODate != $b4podate )
// {
// $logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
/*----------end--------------------*/
@ -2057,8 +2105,8 @@ function addNewImportPurchaseOrder()
/* --------------------------------------------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$this->purchaseorder_model->newlogpo($logpo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $this->purchaseorder_model->newlogpo($logpo);
/* --------------------------------------------*/
if(trim($POType) == IMPORT )
@ -2094,6 +2142,10 @@ function addNewImportPurchaseOrder()
$PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier');
$newsup=$this->input->post('newsup');
$newSupId = split("[ - ]+", $newsup);
/*-----------------------------------*/
$b4supplier=$this->input->post('b4supplier');
$b4date=$this->input->post('b4podate');
@ -2197,8 +2249,28 @@ function addNewImportPurchaseOrder()
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
//echo "sdasds";
$LineItemStatus = REQITEM_NEW;
//echo $LineItemStatus;
if($PODate == $b4podate )
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4podate,'newValue'=>$PODate,'entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4supplier,'newValue'=>$newsup,'entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
//echo $RowCount;
@ -2303,15 +2375,33 @@ function addNewImportPurchaseOrder()
/*---------start---------------------*/
if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
($Quantity != $b4qty ))
{
$logpo =array('UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt);
// if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
// ($Quantity != $b4qty ))
// {
// $logpo =array('UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
if($Quantity != $b4qty)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4qty,'newValue'=>$Quantity,'entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4rate,'newValue'=>$itemRate,'entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
/*----------end--------------------*/
//echo "sdsfsd";
@ -2725,8 +2815,8 @@ function addNewImportPurchaseOrder()
/* --------------------------------------------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$this->purchaseorder_model->newlogpo($logpo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $this->purchaseorder_model->newlogpo($logpo);
/* --------------------------------------------*/
if(trim($POType) == CAPITAL )
{
@ -2775,6 +2865,13 @@ function addNewImportPurchaseOrder()
$POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier');
$newsup=$this->input->post('newsup');
$newSupId = split("[ - ]+", $newsup);
$DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydate');
@ -2880,7 +2977,21 @@ function addNewImportPurchaseOrder()
$LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate )
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4podate,'newValue'=>$PODate,'entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4supplier,'newValue'=>$newsup,'entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
for ($i = 1; $i <= $RowCount; $i++)
{
@ -2980,15 +3091,36 @@ function addNewImportPurchaseOrder()
/*---------start---------------------*/
if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
($Quantity != $b4qty ))
{
$logpo =array('UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt);
// if(($PODate != $b4podate )||( $SupplierID != $b4supplier) || ($itemRate !=$b4rate) ||
// ($Quantity != $b4qty ))
// {
// $logpo =array('UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
if($Quantity != $b4qty)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4qty,'newValue'=>$Quantity,'entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4rate,'newValue'=>$itemRate,'entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
/*----------end--------------------*/

55
application/controllers/servicepurchaseorder.php
View File

@ -326,9 +326,9 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
/*---------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
// $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$addlog= $this->purchaseorder_model->newlogpo($logpo);
// $addlog= $this->purchaseorder_model->newlogpo($logpo);
/*---------*/
if(trim($POType) == SERVICE )
@ -349,7 +349,9 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
function UpdateServicePurchaseOrder()
{
$PONO =$this->input->post('txtPONO');
//echo $PONO;
$newsup=$this->input->post('newsup');
$newSupId = split("[ - ]+", $newsup);
$POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt);
/*-----------------------------------*/
@ -408,6 +410,25 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate )
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4podate,'newValue'=>$PODate,'entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($newSupId[0] != $b4supplier)
{
//$newsupname = $newSupId[0].'-'.$newSupId[1];
//echo $newsup;die;
$logpo =array('PONO'=>$PONO,'LineItemNos'=>'-','UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4supplier,'newValue'=>$newsup,'entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
for ($i = 1; $i <= $RowCount; $i++)
{
@ -450,15 +471,33 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
/*---------start---------------------*/
if(($PODate != $b4podate )||($SupplierID != $b4supplier) || ($itemRate!=$b4rate) ||
($Quantity != $b4qty ))
{
$logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
// if(($PODate != $b4podate )||($SupplierID != $b4supplier) || ($itemRate!=$b4rate) ||
// ($Quantity != $b4qty ))
// {
// $logpo =array('UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// $this->purchaseorder_model->updatelogpo($MaterialCode,$POLineItemNo,$logpo);
// }
if($Quantity != $b4qty)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4qty,'newValue'=>$Quantity,'entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNos'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'UpdatedOn'=>$updateddt,'oldValue'=>$b4rate,'newValue'=>$itemRate,'entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
/*----------end--------------------*/

101
application/models/purchaseorder_model.php
View File

@ -2219,55 +2219,55 @@ return $afftectedRows;
function newlogpo($logpo)
{
// function newlogpo($logpo)
// {
// $this->db->trans_start();
// $this->db->insert('T_ponewlogs_Details',$logpo);
// $insert_id = $this->db->affected_rows();
// $this->db->trans_complete();
// return $insert_id;
// // $this->db->trans_start();
// // $this->db->insert('T_polog_Details',$logpo);
// // $insert_id = $this->db->affected_rows();
// // $this->db->trans_complete();
// // return $insert_id;
// }
function insertlogpo($logpo){
// $this->db->where('MaterialCode',$MaterialCode,'LineItemNos',$POLineItemNo);
// $this->db->update('T_ponewlogs_Details',$logpo);
$this->db->trans_start();
$this->db->insert('T_ponewlogs_Details',$logpo);
$this->db->insert('T_polog_Details',$logpo);
$insert_id = $this->db->affected_rows();
$this->db->trans_complete();
return $insert_id;
}
function updatelogpo($MaterialCode,$POLineItemNo,$logpo){
$this->db->where('MaterialCode',$MaterialCode,'LineItemNos',$POLineItemNo);
$this->db->update('T_ponewlogs_Details',$logpo);
$r = $this->db->affected_rows();
return $r;
}
function getlogpodtl($PONO){
// $SQL = "select
// log.Date as Ldate,log.PONO as LPONO,log.Quantity as Lqty,log.LineItemNos,log.MaterialCode as lmaterial,
// log.Rate as Lrate,log.SupplierID as LSuppid,log.UpdateBy,log.UpdatedOn,pm.PONO,pm.PODate,pm.SupplierID,pl.MaterialCode,pl.Quantity,pl.Rate
// from T_ponewlogs_Details log
// join T_PurchaseOrder_LineItem pl on log.LineItemNos = pl.LineItemNo
// join T_PurchaseOrder_Master pm on pm.PONO = log.PONO
// where pm.PONO ='".$PONO."'";
// select distinct log.PONO as LPONO,
// $SQL = "select distinct log.PONO as LPONO,
// case
// WHEN log.Quantity <> pl.Quantity THEN log.Quantity
// else '-'
// ENd as Lqty,
// case
// WHEN log.SupplierID <> pm.SupplierID THEN log.SupplierID
// WHEN log.SupplierID <> pm.SupplierID THEN sup.Suppliername
// else '-'
// ENd as LSuppid,
// case
@ -2280,46 +2280,25 @@ function getlogpodtl($PONO){
// ENd as logRate ,
// log.LineItemNos,log.MaterialCode,log.UpdatedOn,log.UpdateBy
// log.LineItemNos,log.MaterialCode,log.UpdatedOn,log.UpdateBy,emp.FirstName
// from T_ponewlogs_Details log
// join T_PurchaseOrder_LineItem pl on log.LineItemNos = pl.LineItemNo
// join T_PurchaseOrder_Master pm on pm.PONO = log.PONO
// where pm.PONO
// join T_PurchaseOrder_Master pm on pm.PONO = log.PONO
// join tbl_users user on user.userId = log.UpdateBy
// left join T_Employee_Details emp on emp.EmpID= user.EmpID
// left join T_SupplierDetailsN sup on sup.SupplierID = log.SupplierID
// where log.PONO ='".$PONO."'";
$SQL = "select distinct log.PONO as LPONO,
case
WHEN log.Quantity <> pl.Quantity THEN log.Quantity
else '-'
ENd as Lqty,
case
WHEN log.SupplierID <> pm.SupplierID THEN sup.Suppliername
else '-'
ENd as LSuppid,
case
WHEN log.Date <> pm.PODate THEN log.Date
else '-'
ENd as logDate ,
case
WHEN log.Rate <> pl.Rate THEN log.Rate
else '-'
ENd as logRate ,
log.LineItemNos,log.MaterialCode,log.UpdatedOn,log.UpdateBy,emp.FirstName
from T_ponewlogs_Details log
join T_PurchaseOrder_LineItem pl on log.LineItemNos = pl.LineItemNo
join T_PurchaseOrder_Master pm on pm.PONO = log.PONO
join tbl_users user on user.userId = log.UpdateBy
$SQL = "select log.*,sup.SupplierName,emp.FirstName from
T_polog_Details log
join tbl_users user on user.userId = log.UpdateBy
left join T_Employee_Details emp on emp.EmpID= user.EmpID
left join T_SupplierDetailsN sup on sup.SupplierID = log.SupplierID
where log.PONO ='".$PONO."'";
left join T_SupplierDetailsN sup on sup.SupplierID = log.oldValue
where PONO ='".$PONO."'";
$logpodtl = $this->db->query($SQL);

52
application/views/EditservicePurchaseorder.php
View File

@ -130,7 +130,7 @@ if(!empty($getlogpodtl ))
{
foreach ($getlogpodtl as $values )
{
$update=$values->UpdateBy;
$update=$values->FirstName;
}
}
@ -284,6 +284,10 @@ $("#PODate").datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); */
$('#drpSupplier').change(function() {
var cd = $("#drpSupplier option:selected").text();
//alert(cd);
$("#changeSup").val(cd);
var PaymentOtherData = '<?php echo $otherPayment; ?>';
var id = $('#drpSupplier').val();
@ -789,11 +793,19 @@ $(document).ready(function () {
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
endforeach;
}
echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
<input type="hidden" name="newsup" id="changeSup">
</div>
<div class="col-md-12"><br/>
@ -2322,12 +2334,13 @@ $(document).ready(function () {
<thead style="background-color:#ddf">
<tr>
<th>Sno</th>
<!-- <th>PONO</th> -->
<th>PONO</th>
<!-- <th>Material</th> -->
<th>Date</th>
<th>Quantity</th>
<th>Rate</th>
<th>Supplier</th>
<!-- <th>Date</th> -->
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
@ -2348,19 +2361,32 @@ $(document).ready(function () {
<tr id="<?php echo $inde ; ?>">
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<!--
<?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td>
<td><?php echo $oldpo->FirstName ?></td>
<td><?=$logdate;?></td> -->
<td><?php echo $oldpo->LineItemNos;?></td>
<td><?php echo $oldpo->entity?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$oldValue = date('d-m-Y',strtotime($oldpo->oldValue));
}else{
$oldValue = $oldpo->oldValue;
}?>
<td><?php echo $oldValue.'-'.$oldpo->SupplierName;?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$newValue = date('d-m-Y',strtotime($oldpo->newValue));
}else{
$newValue = $oldpo->newValue;
}?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
echo $date->format('d-m-Y'); ?></td>

55
application/views/editCapitalPo.php
View File

@ -209,7 +209,7 @@ if(!empty($getlogpodtl))
foreach ($getlogpodtl as $values )
{
$update=$values->UpdateBy;
$update=$values->FirstName;
}
}
@ -553,7 +553,8 @@ $("#PaymentMethod").select2();
echo form_dropdown('drpSupplier', $options2,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
<input type="hidden" name="newsup" id="changeSup">
</div>
<div class="col-md-12"><br/>
@ -3802,25 +3803,27 @@ $("#PaymentMethod").select2();
<!--################################################################## -->
<?php if(!empty($update)){?>
<div class="col-md-12" id="editpodiv">
<?php if(!empty($update)){?>
<div class="col-md-12" id="editpodiv">
<div class="col-md-12"><label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead style="background-color:#ddf">
<tr>
<th>Sno</th>
<!-- <th>PONO</th> -->
<th>PONO</th>
<!-- <th>Material</th> -->
<th>Date</th>
<th>Quantity</th>
<th>Rate</th>
<th>Supplier</th>
<!-- <th>Date</th> -->
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($getlogpodtl))
@ -3834,18 +3837,31 @@ $("#PaymentMethod").select2();
<tr id="<?php echo $inde ; ?>">
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<!--
<?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td>
<td><?=$logdate;?></td> -->
<td><?php echo $oldpo->LineItemNos;?></td>
<td><?php echo $oldpo->entity?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$oldValue = date('d-m-Y',strtotime($oldpo->oldValue));
}else{
$oldValue = $oldpo->oldValue;
}?>
<td><?php echo $oldValue.'-'.$oldpo->SupplierName;?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$newValue = date('d-m-Y',strtotime($oldpo->newValue));
}else{
$newValue = $oldpo->newValue;
}?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
@ -3858,10 +3874,12 @@ $("#PaymentMethod").select2();
}
?>
</tbody>
<?php } else {}?>
</table>
<?php } else {}?>
</div>
</div>
</div>
<div class="col-md-12">
<label>Special Instructions </label> <?php
@ -4037,6 +4055,11 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
}
$('#drpSupplier').change(function() {
var cd = $("#drpSupplier option:selected").text();
//alert(cd);
$("#changeSup").val(cd);
var PaymentOtherData = '<?php echo $otherPayment; ?>';
var id = $('#drpSupplier').val();
var supPaymentTerms='';

55
application/views/editRevenuepurchaseorder.php
View File

@ -142,7 +142,7 @@ if(!empty($getlogpodtl ))
{
foreach ($getlogpodtl as $values )
{
$update=$values->UpdateBy;
$update=$values->FirstName;
}
}
@ -347,6 +347,10 @@ $(function() {
$('#drpSupplier').change(function() {
var cd = $("#drpSupplier option:selected").text();
//alert(cd);
$("#changeSup").val(cd);
var id = $('#drpSupplier').val();
$("#SupAddress").val('');
@ -2311,7 +2315,9 @@ function calculateEditTaxValue()
echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
<input type="hidden" name="newsup" id="changeSup">
</div>
<div class="col-md-4">
<label>Purchase Order Type</label>
@ -4206,24 +4212,27 @@ function calculateEditTaxValue()
</div>
<!--################################################################## -->
<div class="col-md-12" id="editpodiv">
<?php if(!empty($update)){?>
<div class="col-md-12" id="editpodiv">
<div class="col-md-12"><label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead style="background-color:#ddf">
<tr>
<th>Sno</th>
<!-- <th>PONO</th> -->
<th>PONO</th>
<!-- <th>Material</th> -->
<th>Date</th>
<th>Quantity</th>
<th>Rate</th>
<th>Supplier</th>
<!-- <th>Date</th> -->
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($getlogpodtl))
@ -4237,18 +4246,32 @@ function calculateEditTaxValue()
<tr id="<?php echo $inde ; ?>">
<td><?php echo $inde; ?></td>
<?php if($oldpo->logDate !='-'){
<td><?php echo $oldpo->PONO ?></td>
<!--
<?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td>
<td><?php echo $oldpo->FirstName ?></td>
<td><?=$logdate;?></td> -->
<td><?php echo $oldpo->LineItemNos;?></td>
<td><?php echo $oldpo->entity?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$oldValue = date('d-m-Y',strtotime($oldpo->oldValue));
}else{
$oldValue = $oldpo->oldValue;
}?>
<td><?php echo $oldValue.'-'.$oldpo->SupplierName;?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$newValue = date('d-m-Y',strtotime($oldpo->newValue));
}else{
$newValue = $oldpo->newValue;
}?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
echo $date->format('d-m-Y'); ?></td>
@ -4260,6 +4283,7 @@ function calculateEditTaxValue()
}
?>
</tbody>
<?php } else {}?>
</table>
</div>
</div>
@ -4267,6 +4291,7 @@ function calculateEditTaxValue()
<!-- Revenue Special PO Modal Starts Here -->
<div id="EditRevenueSplPOModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel" >
<div class="modal-dialog">

54
application/views/editimportpo.php
View File

@ -216,7 +216,7 @@ if(!empty($getlogpodtl))
foreach ($getlogpodtl as $values )
{
$update=$values->UpdateBy;
$update=$values->FirstName;
}
}
@ -485,7 +485,7 @@ else
echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId;?>">
<input type="hidden" name="newsup" id="changeSup">
</div>
@ -3070,25 +3070,27 @@ echo form_textarea($data);
<input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden?>>
<!--################################################################## -->
<?php if(!empty($update)){?>
<div class="col-md-12" id="editpodiv">
<?php if(!empty($update)){?>
<div class="col-md-12" id="editpodiv">
<div class="col-md-12"><label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead style="background-color:#ddf">
<tr>
<th>Sno</th>
<!-- <th>PONO</th> -->
<th>PONO</th>
<!-- <th>Material</th> -->
<th>Date</th>
<th>Quantity</th>
<th>Rate</th>
<th>Supplier</th>
<!-- <th>Date</th> -->
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($getlogpodtl))
@ -3102,18 +3104,31 @@ echo form_textarea($data);
<tr id="<?php echo $inde ; ?>">
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<?php if($oldpo->logDate !='-'){
<!--
<?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td>
<td><?=$logdate;?></td> -->
<td><?php echo $oldpo->LineItemNos;?></td>
<td><?php echo $oldpo->entity?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$oldValue = date('d-m-Y',strtotime($oldpo->oldValue));
}else{
$oldValue = $oldpo->oldValue;
}?>
<td><?php echo $oldValue.'-'.$oldpo->SupplierName;?></td>
<?php if($oldpo->entity =='PO DateChanged'){
$newValue = date('d-m-Y',strtotime($oldpo->newValue));
}else{
$newValue = $oldpo->newValue;
}?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
@ -3126,11 +3141,11 @@ echo form_textarea($data);
}
?>
</tbody>
<?php } else {}?>
</table>
<?php } else {}?>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
@ -3402,6 +3417,9 @@ $('#currencytype').change(function()
$('#drpSupplier').change(function() {
var cd = $("#drpSupplier option:selected").text();
//alert(cd);
$("#changeSup").val(cd);
var id = $('#drpSupplier').val();

BIN
uploads/BillFiles/ria_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 KiB

BIN
uploads/BillFiles/sia_2_.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 KiB

BIN
uploads/BillFiles/sia_2_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 KiB