diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index ef1a0dd8..e11f7a2e 100755 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -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--------------------*/ diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 7522f2a6..e353dfb5 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -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--------------------*/ diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index 6e76770b..1d971ca5 100755 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -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--------------------*/ diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 99255d3f..476acdd5 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -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); diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index cb9be142..c4612d49 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -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 = ''; 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'); - ?> + ?> + + + + + +

@@ -2322,12 +2334,13 @@ $(document).ready(function () { Sno - + PONO - Date - Quantity - Rate - Supplier + + LineItemNo + Entity + OldValue + NewValue UpdatedBy UpdateOn @@ -2348,19 +2361,32 @@ $(document).ready(function () { + PONO ?> - + + LineItemNos;?> + entity?> + entity =='PO DateChanged'){ + $oldValue = date('d-m-Y',strtotime($oldpo->oldValue)); + }else{ + $oldValue = $oldpo->oldValue; + }?> + SupplierName;?> + + entity =='PO DateChanged'){ + $newValue = date('d-m-Y',strtotime($oldpo->newValue)); + }else{ + $newValue = $oldpo->newValue; + }?> + + FirstName?> UpdatedOn); echo $date->format('d-m-Y'); ?> diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index 2768ca3f..cb7b91a8 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -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'); - ?> + ?> +

@@ -3802,25 +3803,27 @@ $("#PaymentMethod").select2(); - -
+ +
- + - - - - + + + + + + "> + - + + + + entity =='PO DateChanged'){ + $oldValue = date('d-m-Y',strtotime($oldpo->oldValue)); + }else{ + $oldValue = $oldpo->oldValue; + }?> + + + entity =='PO DateChanged'){ + $newValue = date('d-m-Y',strtotime($oldpo->newValue)); + }else{ + $newValue = $oldpo->newValue; + }?> + +
SnoPONO DateQuantityRateSupplierLineItemNoEntityOldValueNewValue UpdatedBy UpdateOn
PONO ?>LineItemNos;?>entity?>SupplierName;?> FirstName?> UpdatedOn); @@ -3858,10 +3874,12 @@ $("#PaymentMethod").select2(); } ?>
-
-
+
+ +
; } $('#drpSupplier').change(function() { + + var cd = $("#drpSupplier option:selected").text(); + //alert(cd); + $("#changeSup").val(cd); + var PaymentOtherData = ''; var id = $('#drpSupplier').val(); var supPaymentTerms=''; diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php index c58577f4..80d9ede7 100755 --- a/application/views/editRevenuepurchaseorder.php +++ b/application/views/editRevenuepurchaseorder.php @@ -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'); - ?> + ?> + +
@@ -4206,24 +4212,27 @@ function calculateEditTaxValue()
-
+ +
- + - - - - + + + + + + "> - - logDate !='-'){ + + + + + + entity =='PO DateChanged'){ + $oldValue = date('d-m-Y',strtotime($oldpo->oldValue)); + }else{ + $oldValue = $oldpo->oldValue; + }?> + + + entity =='PO DateChanged'){ + $newValue = date('d-m-Y',strtotime($oldpo->newValue)); + }else{ + $newValue = $oldpo->newValue; + }?> + + @@ -4260,6 +4283,7 @@ function calculateEditTaxValue() } ?> +
SnoPONO DateQuantityRateSupplierLineItemNoEntityOldValueNewValue UpdatedBy UpdateOn
PONO ?>LineItemNos;?>entity?>SupplierName;?>FirstName?> UpdatedOn); echo $date->format('d-m-Y'); ?>
@@ -4267,6 +4291,7 @@ function calculateEditTaxValue() +