RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-06-28 15:58:17 +05:30
parent 2927edf798
commit 9981afe243
12 changed files with 1040 additions and 2661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/config/database.php
View File

@ -64,5 +64,27 @@ $db['default']['swap_pre'] = '';
$db['default']['autoinit'] = TRUE; $db['default']['autoinit'] = TRUE;
$db['default']['stricton'] = FALSE; $db['default']['stricton'] = FALSE;
// DB_USERNAME=resicoin_invoice
// DB_PASSWORD=resicoin_invoice
// DB_DATABASE=resicoin_invoices
// DB_DATABASE=resicoin_invoicetest #kasiram9_InvoiceTest
$db['invoicedb']['hostname'] = 'resicoindustries.com';
$db['invoicedb']['username'] = 'resicoin_invoice';
$db['invoicedb']['password'] = 'resicoin_invoice';
//$db['invoicedb']['database'] = 'resicoin_invoicetest';
$db['invoicedb']['database'] = 'resicoin_invoices';
$db['invoicedb']['dbdriver'] = 'mysqli';
$db['invoicedb']['dbprefix'] = '';
$db['invoicedb']['pconnect'] = TRUE;
$db['invoicedb']['db_debug'] = FALSE;
$db['invoicedb']['cache_on'] = FALSE;
$db['invoicedb']['cachedir'] = '';
$db['invoicedb']['char_set'] = 'utf8';
$db['invoicedb']['dbcollat'] = 'utf8_general_ci';
$db['invoicedb']['swap_pre'] = '';
$db['invoicedb']['autoinit'] = TRUE;
$db['invoicedb']['stricton'] = FALSE;
/* End of file database.php */ /* End of file database.php */
/* Location: ./application/config/database.php */ /* Location: ./application/config/database.php */

1251
application/controllers/batchcard.php
View File

File diff suppressed because it is too large Load Diff

15
application/controllers/purchaseorder.php
View File

@ -1067,6 +1067,7 @@ class purchaseorder extends BaseController
$DeliveryAddr = $this->input->post('txtDeliveryAddress'); $DeliveryAddr = $this->input->post('txtDeliveryAddress');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydt');
$DeliveryOption = $this->input->post('DateRange'); $DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1){ if($DeliveryOption==1){
$Deliverydt = ''; $Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby'); $DeliverySchedule = $this->input->post('Scheduleby');
@ -1087,6 +1088,7 @@ class purchaseorder extends BaseController
$fincap=$this->input->post('editfincap'); $fincap=$this->input->post('editfincap');
$revenuetype=$this->input->post('PoTypeOptions'); $revenuetype=$this->input->post('PoTypeOptions');
$insurancestatus=$this->input->post('insurancestatus'); $insurancestatus=$this->input->post('insurancestatus');
if($insurancestatus == 1){ if($insurancestatus == 1){
$insuranceno=$this->input->post('insuranceno'); $insuranceno=$this->input->post('insuranceno');
}else{ }else{
@ -1122,6 +1124,7 @@ class purchaseorder extends BaseController
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate ) if($PODate != $b4podate )
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4podate,'NewValue'=>$PODate,'Entity'=>'PO DateChanged'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4podate,'NewValue'=>$PODate,'Entity'=>'PO DateChanged');
@ -1140,7 +1143,7 @@ class purchaseorder extends BaseController
} }
for ($i = 1; $i <= $RowCount; $i++) for($i = 1; $i <= $RowCount; $i++)
{ {
$MaterialCode = $this->input->post('materialCode'.$i); $MaterialCode = $this->input->post('materialCode'.$i);
@ -1179,7 +1182,6 @@ class purchaseorder extends BaseController
if($Quantity != $b4qty) if($Quantity != $b4qty)
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
@ -1187,19 +1189,17 @@ class purchaseorder extends BaseController
if($itemRate != $b4rate) if($itemRate != $b4rate)
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4rate,'NewValue'=>$itemRate,'Entity'=>'Rate Changed'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4rate,'NewValue'=>$itemRate,'Entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
$SkipInsert = "False"; $SkipInsert = "False";
if( count($comma_separated) > 0) if( count($comma_separated) > 0)
{ {
for($j = 1; $j < count($comma_separated); $j++) for($j = 1; $j < count($comma_separated); $j++)
{ {
$deletedRow = $comma_separated[$j] ; $deletedRow = $comma_separated[$j] ;
if($deletedRow == $i ) if($deletedRow == $i )
{ {
$SkipInsert = "True"; $SkipInsert = "True";
@ -1213,7 +1213,6 @@ class purchaseorder extends BaseController
$ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt); $ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updateReqDetails($Reqnumber,$MaterialCode,$ReqDetails); $this->purchaseorder_model->updateReqDetails($Reqnumber,$MaterialCode,$ReqDetails);
$recqty=0; $recqty=0;
@ -1253,9 +1252,7 @@ class purchaseorder extends BaseController
} }
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if(count($isExists) == 0) if(count($isExists) == 0)
{ {}
}
else else
{ {

30
application/controllers/rawmaterialdetails.php
View File

@ -168,6 +168,19 @@ else
$ConversionFactor = $this->input->post('conversionfactor'); $ConversionFactor = $this->input->post('conversionfactor');
$cfuom = $this->input->post('conversionfactorUOM');//print_r( $ConversionFactorUOM); $cfuom = $this->input->post('conversionfactorUOM');//print_r( $ConversionFactorUOM);
$HSN = $this->input->post('HSNcode');//print_r($HSNcode); $HSN = $this->input->post('HSNcode');//print_r($HSNcode);
$stock = $this->input->post('openstock');
$reorder = $this->input->post('reorder');
$stockdate = $this->input->post('Date');
if (empty($stockdate))
{
$stockdate = NULL;
}
else
{
$stockdate = strtotime( $stockdate);
$stockdate = date("Y-m-d ", $stockdate);
}
$CreatedBy = $this->session->userdata('userId'); $CreatedBy = $this->session->userdata('userId');
$chked = $this->input->post('isactive'); $chked = $this->input->post('isactive');
@ -214,7 +227,7 @@ else
$IsActive = '0'; $IsActive = '0';
} }
$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode); $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode ,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
if($result > 0) if($result > 0)
@ -245,6 +258,7 @@ else
$RawMaterialID = $_GET['RID']; $RawMaterialID = $_GET['RID'];
$MaterialType = $_GET['MType']; $MaterialType = $_GET['MType'];
$UOM = $_GET['UOM']; $UOM = $_GET['UOM'];
$currentdate=$_GET['date1'];
} }
else else
{ {
@ -252,6 +266,7 @@ else
} }
$data['materialDetails'] = $this->rawmaterialdetails_model->getMaterialDetails($RawMaterialID); $data['materialDetails'] = $this->rawmaterialdetails_model->getMaterialDetails($RawMaterialID);
$data['currentstock'] = $this->rawmaterialdetails_model->getMaterialstock($RawMaterialID, $currentdate);
$data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType ); $data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType );
$data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory); $data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory);
$data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM); $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM);
@ -319,6 +334,18 @@ else
$ConversionFactor = $this->input->post('conversionfactor'); $ConversionFactor = $this->input->post('conversionfactor');
$cfuom = $this->input->post('conversionfactorUOM'); $cfuom = $this->input->post('conversionfactorUOM');
$HSN = $this->input->post('HSNcode'); $HSN = $this->input->post('HSNcode');
$stock = $this->input->post('openstock');
$reorder = $this->input->post('reorder');
$stockdate = $this->input->post('Date');
if (empty($stockdate))
{
$stockdate = NULL;
}
else
{
$stockdate = strtotime( $stockdate);
$stockdate = date("Y-m-d ", $stockdate);
}
$UpdatedBy = $this->session->userdata ('userId'); $UpdatedBy = $this->session->userdata ('userId');
$chked = $this->input->post('isactive'); $chked = $this->input->post('isactive');
if($asset == '0') if($asset == '0')
@ -365,6 +392,7 @@ else
$RawMaterial = array(); $RawMaterial = array();
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode); $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode); $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
if($result == true) if($result == true)

721
application/models/batchcard_model.php
View File

File diff suppressed because it is too large Load Diff

17
application/models/purchaseorder_model.php
View File

@ -23,6 +23,7 @@ class purchaseorder_model extends CI_Model
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
} }
function getfies($pono) function getfies($pono)
{ {
@ -38,16 +39,16 @@ class purchaseorder_model extends CI_Model
} }
function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){ function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){
$this->db->where('ReqNo',$Reqnumber); $this->db->where('ReqNo',$Reqnumber);
$this->db->where('MaterialCode',$MaterialCode); $this->db->where('MaterialCode',$MaterialCode);
$this->db->update('T_Requestion_Details',$ReqDetail); $this->db->update('T_Requestion_Details',$ReqDetail);
$r = $this->db->affected_rows(); $r = $this->db->affected_rows();
return $r; return $r;
} }
//function IGRDetailsupdate($PONO) //function IGRDetailsupdate($PONO)old file name
function getIGRDetails($PONO) function getIGRDetails($PONO)
{ {

33
application/models/rawmaterialdetails_model.php
View File

@ -113,6 +113,39 @@ class rawmaterialdetails_model extends CI_Model
return $query->result(); return $query->result();
} }
function getMaterialstock($MaterialCode, $currentdate)
{
$dt = date('d',strtotime($currentdate));
$year = date('Y', strtotime($currentdate));
$month = date('m', strtotime($currentdate));
if($month<04)
{
$newyr = $year - 1;
$startdate = $newyr.'-'.'04'.'-'.'01';
}
else
{
$startdate = $year.'-'.'04'.'-'.'01';
}
$nedt= $dt+1;
$newdate=$year.'-'.$month.'-'.$nedt;
$subquery="SELECT SUM(IF(Transaction_type='Add',Quantity,0)) - SUM(IF(Transaction_type='Reduce',Quantity,0))as remainingqty
FROM T_Material_stock_history
WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
$query = $this->db->query($subquery,array($MaterialCode,$startdate,$newdate));
return $query->result_array();
}
function getAssetcode() function getAssetcode()
{ {
$this->db->select('AssetCode,AssetName'); $this->db->select('AssetCode,AssetName');

3
application/views/MaterialHistory.php
View File

@ -52,8 +52,9 @@ table.dataTable thead > tr > td.sorting {
<!-- TABLE: LATEST ORDERS --> <!-- TABLE: LATEST ORDERS -->
<div class="box box-info"> <div class="box box-info">
<div class="box-header with-border"> <div class="box-header with-border">
<center><h3 class="box-title"><p style="color:#5d0411"><b>Siddharth Industries - Material History</b><br><br> <center><h3 class="box-title"><p style="color:#5d0411"><b><?php echo $pageTitle; ?> - Material History</b><br><br>
<?php <?php
//print_r($firstinvoice);
if($this->input->post('item_name')){ if($this->input->post('item_name')){
$it=$this->input->post('item_name'); $it=$this->input->post('item_name');

84
application/views/addRawMaterial.php
View File

@ -6,6 +6,15 @@
outline: 1px solid slategrey; outline: 1px solid slategrey;
} }
</style> </style>
<script>
$(function() {
$("#Date").datepicker({
//minDate :'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
});
});
</script>
<script type="text/javascript" src="<?php echo base_url();?>assets/Autocomplete/jquery.autocomplete.js"></script> <script type="text/javascript" src="<?php echo base_url();?>assets/Autocomplete/jquery.autocomplete.js"></script>
<div class="content-wrapper" style="min-height: 537px;"> <div class="content-wrapper" style="min-height: 537px;">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
@ -60,7 +69,6 @@
</div> </div>
</div> </div>
<div class="col-md-3" > <div class="col-md-3" >
<div class="form-group autoSearch" id="mc"> <div class="form-group autoSearch" id="mc">
<label for="Matcate">Material Caterogy</label><font color="Red">*</font> <label for="Matcate">Material Caterogy</label><font color="Red">*</font>
@ -155,7 +163,7 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label for="conversionfactor">Conversion Factor</label> <label for="conversionfactor">Conversion Factor</label>
<input type="text" class="form-control" id="conversionfactor" name="conversionfactor" maxlength="255" > <input type="text" class="form-control" id="conversionfactor" name="conversionfactor" maxlength="255">
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -185,6 +193,27 @@
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8"> <input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Opening Stock</label>
<input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
</div>
</div>
<div class="col-md-3">
<label>Open Stock Date</label>
<?php
$data = array('name' => 'Date','value' => set_value('Date'),'id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Reorder Level</label>
<input type="text" class="form-control" id="reorder" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="remarks">Remarks</label> <label for="remarks">Remarks</label>
@ -218,8 +247,8 @@
$(document).ready(function(){ $(document).ready(function(){
$("#MaterialType").select2(); $("#MaterialType").select2();
// $("#MaterialCategory").select2(); // $("#MaterialCategory").select2();
$("#UOM").select2(); $("#UOM").select2();
$("#Assetcode").select2(); $("#Assetcode").select2();
$("#Costcenter").select2(); $("#Costcenter").select2();
@ -227,32 +256,32 @@ $("#MaterialType").select2();
$('#MatCate').autocomplete({ $('#MatCate').autocomplete({
onSearchStart: function (query) { onSearchStart: function (query) {
$('#MatCate').autocomplete("option", "minLength", 0); $('#MatCate').autocomplete("option", "minLength", 0);
}, },
serviceUrl: "<?php echo base_url();?>rawmaterialdetails/autocomplete", serviceUrl: "<?php echo base_url();?>rawmaterialdetails/autocomplete",
onSelect: function (suggestion) { onSelect: function (suggestion) {
var data = suggestion.ConfigValue; var data = suggestion.ConfigValue;
var selectedvalue = $('input[name=MatCate]').val(); var selectedvalue = $('input[name=MatCate]').val();
if(selectedvalue=='Spares') if(selectedvalue=='Spares')
{ {
//alert('good');
//$('#contest_num').hide(); //$('#contest_num').hide();
$('#Assetcode').prop('disabled', false); $('#Assetcode').prop('disabled', false);
$('#Costcenter').prop('disabled', false); $('#Costcenter').prop('disabled', false);
} }
else{ else{
// // alert('bad');
$('#Assetcode').prop('disabled', 'disabled'); $('#Assetcode').prop('disabled', 'disabled');
$('#Costcenter').prop('disabled', 'disabled'); $('#Costcenter').prop('disabled', 'disabled');
} }
} }
}); });
}); });
@ -268,7 +297,7 @@ function isNumberKey(evt)
} }
function BlockSpecial(evt) { function BlockSpecial(evt) {
var charCode; var charCode;
// if (window.event) // if (window.event)
// charCode = window.event.keyCode; //for IE // charCode = window.event.keyCode; //for IE
@ -340,10 +369,10 @@ function Validate()
$('#MaterialName').change(function() { $('#MaterialName').change(function() {
var materialname = $('#MaterialName').val(); var materialname = $('#MaterialName').val();
//material = material.replace(/\s*$/,""); //material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g,''); var material = materialname.replace(/ /g,'');
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:material}, data:{id:material},
@ -377,7 +406,7 @@ $('#MaterialName').change(function() {
swal( "'" + materialname + "' - related materials are ," , related_name); swal( "'" + materialname + "' - related materials are ," , related_name);
$("#MaterialName").focus(); $("#MaterialName").focus();
});//sweet alert closed.... });//sweet swal closed....
} }
@ -386,19 +415,6 @@ $('#MaterialName').change(function() {
} }
} }
}); });
}); });
</script>
// function changeTextBox() {
// var x = document.getElementById("MaterialCategory");
// if(x.value=='Spares')
// {
// document.getElementById("Assetcode").disabled=false;
// document.getElementById("Costcenter").disabled=false;
// }
// else
// {
// document.getElementById("Assetcode").disabled=true;
// document.getElementById("Costcenter").disabled=true; }
// }
</script>

81
application/views/editRawmaterial.php
View File

@ -13,6 +13,10 @@ $conversionactor ='';
$RMCode = ''; $RMCode = '';
$HSNcode = ''; $HSNcode = '';
$IsActive = ''; $IsActive = '';
$openstock='';
$date='';
$reorder='';
$total='0.00';
if(!empty($materialDetails)) if(!empty($materialDetails))
{ {
@ -31,6 +35,9 @@ if(!empty($materialDetails))
$conversionfactorUOM = $MD->ConversionFactorUOM; $conversionfactorUOM = $MD->ConversionFactorUOM;
$RMCode = $MD->RMCode; $RMCode = $MD->RMCode;
$HSNcode = $MD->HSNCODE; $HSNcode = $MD->HSNCODE;
$swal=$MD->stock;
$date=$MD->stockdate;
$reorder=$MD->reorder;
$chk = $MD->IsActive; $chk = $MD->IsActive;
if($chk == 1) if($chk == 1)
@ -44,8 +51,41 @@ if(!empty($materialDetails))
} }
} }
if(!empty($currentstock))
{
$currentstock =$currentstock[0]['remainingqty'];
$x = $swal;
$y = $currentstock;
$total= $x + $y;
}
?> ?>
<?php
if( $total <= $reorder){
echo '<script type="text/javascript">alert("Current Stock Low ");</script>';
}
?>
<script>
$(function() {
$("#Date").datepicker({
//minDate :'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
});
});
</script>
<style> <style>
.autocomplete-suggestion{ .autocomplete-suggestion{
cursor:pointer; cursor:pointer;
@ -183,7 +223,48 @@ if(!empty($materialDetails))
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" > <input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<label for="openstock">Opening Stock</label>
<?php if($openstock!="") { ?>
<input type="text" class="form-control required " id="openstock" readonly name="openstock" value="<?php echo $openstock;?>" maxlength="255">
<?php } else { ?>
<input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
<?php } ?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="openstockdate" >Open Stock Date</label>
<?php
if($date!="")
{
$data = array('name' => 'Date','value' => set_value('Date',$date), 'class' => 'form-control','readonly'=>'true', 'onkeypress'=>'return false;');
echo form_input($data);
}
else
{
$data = array('name' => 'Date','id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;');
echo form_input($data);
}
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="reorderlevel">Reorder Level</label>
<input type="text" class="form-control" id="reorder" value="<?php echo $reorder;?>" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<div class="form-group">
<label for="currentstock">Current Stock</label>
<input type="text" class="form-control" id="currentstock" readonly value="<?php echo $total; ?>" name="currentstock" maxlength="255">
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="remarks">Remarks</label> <label for="remarks">Remarks</label>

53
application/views/editRevenuepurchaseorder.php
View File

@ -1,6 +1,6 @@
<?php $ReqType =''; <?php $ReqType ='';
$CompanyAddress = ''; $CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('d-m-Y'); $CurrentDate = $dt->format('d-m-Y');
$MaxPoDate = ''; $MaxPoDate = '';
$AvlAmount = 0; $AvlAmount = 0;
@ -103,9 +103,10 @@ $otherPayment = $Req->PaymentOtherDescription;
$insurencestatus = $Req->InsuranceStatus; $insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber; $insurenceno = $Req->InsuranceNumber;
$BudgetType = $Req->BudgetType; $BudgetType = $Req->BudgetType;
$IGRNO = $Req->IGRNO; $IGRNO =$Req->IGRNO;
} }
} }
if(!empty($RequistionDetails)) if(!empty($RequistionDetails))
{ {
foreach ($RequistionDetails as $ReqDet) foreach ($RequistionDetails as $ReqDet)
@ -126,7 +127,7 @@ $update=$values->FirstName;
?> ?>
<style> <style>
#packagingcalmodel { #packagingcalmodel {
margin-top:200px; margin-top:200px;
z-index: 1080 !important; z-index: 1080 !important;
} }
@ -202,6 +203,7 @@ else
{ {
$('#splpodiv').hide(); $('#splpodiv').hide();
} }
var update = '<?php echo json_encode($update)?>'; var update = '<?php echo json_encode($update)?>';
if(update !='null') if(update !='null')
{ {
@ -211,7 +213,7 @@ else
{ {
$('#editpodiv').hide(); $('#editpodiv').hide();
} }
/*****************************/
$('#PoTypeOptions').attr("style", "pointer-events: none;"); $('#PoTypeOptions').attr("style", "pointer-events: none;");
if(DelOpt=="0"){ if(DelOpt=="0"){
$('#Deliverydtdiv').show(); $('#Deliverydtdiv').show();
@ -234,8 +236,6 @@ else{
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
$('#Otherpayment').val(''); $('#Otherpayment').val('');
} }
// var insurancestatus = <?php echo $insurencestatus;?>;
// var insuranceno = <?php echo $insurenceno;?>;
if(insurancestatus == 1) if(insurancestatus == 1)
{ {
@ -1770,7 +1770,6 @@ else if( $('#txtViewFreight').val() != "0" && $('#txtViewFreight').val() != '')
var FreightValue = parseFloat($('#txtViewFreight').val()); var FreightValue = parseFloat($('#txtViewFreight').val());
var UOM = parseFloat($('#ViewUOM').val()); var UOM = parseFloat($('#ViewUOM').val());
var Quantity = parseFloat($('#ViewQuantity').val()); var Quantity = parseFloat($('#ViewQuantity').val());
var AfterFreight = 0.0; var AfterFreight = 0.0;
// if(FreightType == PercentageType) // if(FreightType == PercentageType)
// { // {
@ -2181,6 +2180,7 @@ return tot;
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<div id="content"></div> <div id="content"></div>
<div> <div>
<!-- <center><b><h2>Siddharth Industries - Edit Revenue Purchase Order - <?php echo $PONO;?></h2></b></center></div> -->
<center><b><h2><?php echo $pageTitle . '-' . $PONO;?></h2></b></center></div> <center><b><h2><?php echo $pageTitle . '-' . $PONO;?></h2></b></center></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -4047,10 +4047,21 @@ return tot;
<table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" > <table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-offset-10 col-md-8" > <div class="col-md-offset-10 col-md-8" >
<input type="button" class="btn btn-primary" id ="addmorebutton" value=" ADD FILES.."> <input type="button" class="btn btn-primary" id ="addmorebutton" value=" ADD FILES..">
</div> </div>
<div id="newdiv"></div> <div id="newdiv"></div>
<input type="hidden" name="hidecounter" id="hidecounter" value="0" /> <input type="hidden" name="hidecounter" id="hidecounter" value="0" />
<input type="hidden" name="hideconstant" id="hideconstant" value="0" /> <input type="hidden" name="hideconstant" id="hideconstant" value="0" />
@ -4079,19 +4090,9 @@ return tot;
<td><?php echo $gd->BillNo ?></td> <td><?php echo $gd->BillNo ?></td>
<td ><?php echo (!empty($gd->FilePath))?$gd->FilePath:"No File"; ?></td> <td ><?php echo (!empty($gd->FilePath))?$gd->FilePath:"No File"; ?></td>
<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO?>"> -->
<input type="hidden" id="billnos<?=$index?>" value="<?= $gd->BillNo?>"> <input type="hidden" id="billnos<?=$index?>" value="<?= $gd->BillNo?>">
<input type="hidden" id="file<?=$index?>" name ='file' value="<?=$gd->FilePath?>"> <input type="hidden" id="file<?=$index?>" name ='file' value="<?=$gd->FilePath?>">
<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span> <td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
<?php if(!empty($gd->FilePath)) { ?> <?php if(!empty($gd->FilePath)) { ?>
<a target="_blank" href="<?php echo base_url().'uploads/BillFiles/'?><?php echo $gd->FilePath ?>"><i class="fa fa-download" ></i></a> <a target="_blank" href="<?php echo base_url().'uploads/BillFiles/'?><?php echo $gd->FilePath ?>"><i class="fa fa-download" ></i></a>
@ -4142,8 +4143,6 @@ return tot;
<td><?php echo $inde; ?></td> <td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td> <td><?php echo $oldpo->PONO ?></td>
<td><?php echo $oldpo->LineItemNo;?></td> <td><?php echo $oldpo->LineItemNo;?></td>
<td><?php echo $oldpo->Entity?></td> <td><?php echo $oldpo->Entity?></td>
<?php if($oldpo->Entity =='PO DateChanged'){ <?php if($oldpo->Entity =='PO DateChanged'){
@ -4624,6 +4623,9 @@ return tot;
var TotalOrderValue = $("#txtViewTotalOrderValue").val(); var TotalOrderValue = $("#txtViewTotalOrderValue").val();
var tr= document.getElementById(userid); var tr= document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
@ -4732,7 +4734,6 @@ return tot;
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val(); var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal); totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
totDiscountAmt = parseFloat(totDiscountAmt ) + parseFloat(Discount); totDiscountAmt = parseFloat(totDiscountAmt ) + parseFloat(Discount);
totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging); totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
@ -4975,6 +4976,7 @@ return tot;
}); });
if(result == '0') if(result == '0')
{ {
var DelRows = $('#txtDeletedRow').val(); var DelRows = $('#txtDeletedRow').val();
@ -4989,7 +4991,6 @@ return tot;
} }
$('#txtDeletedRow').val(DelRows); $('#txtDeletedRow').val(DelRows);
} }
// To delete the value from Tables // To delete the value from Tables
else if(result == '1') else if(result == '1')
{ {
@ -5024,6 +5025,7 @@ return tot;
}}); }});
} }
//populateValueMainFormForDeleteItem(rowid);
} }
@ -5101,6 +5103,7 @@ return tot;
var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>'; var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>';
var txtTotalbasicamount = $('#txtTotBasicAmount').val(); var txtTotalbasicamount = $('#txtTotBasicAmount').val();
var totaldiscount = $('#txtTotalDiscount').val(); var totaldiscount = $('#txtTotalDiscount').val();
if(validate()) if(validate())
{ {
if(document.getElementById('revenueTax').rows.length < 2) if(document.getElementById('revenueTax').rows.length < 2)
@ -5509,7 +5512,6 @@ return tot;
$('#ViewdeptName').val($('#departmentName'+userid).val()); $('#ViewdeptName').val($('#departmentName'+userid).val());
$("#ViewCostCenter").val($('#costCode'+userid).val()); $("#ViewCostCenter").val($('#costCode'+userid).val());
$('#ViewAvlBudAmt').val(AvlBudAmt); $('#ViewAvlBudAmt').val(AvlBudAmt);
//
$('#ViewItemName').val($('#materialName'+userid).val()); $('#ViewItemName').val($('#materialName'+userid).val());
$('#ViewUOM').val($('#uom'+userid).val()); $('#ViewUOM').val($('#uom'+userid).val());
@ -5585,8 +5587,6 @@ return tot;
var param1 = $('#hidebillno').val(); var param1 = $('#hidebillno').val();
var param2 = $('#hideoldfile').val(); var param2 = $('#hideoldfile').val();
// var filename = $("#billimag").val();
// filename = filename.split('\\');
formData.append('file',file); formData.append('file',file);
formData.append('param1',param1); formData.append('param1',param1);
formData.append('param2',param2); formData.append('param2',param2);
@ -5662,7 +5662,6 @@ return tot;
var formData = new FormData(); var formData = new FormData();
var file = $("#images"+counter).prop('files')[0]; var file = $("#images"+counter).prop('files')[0];
var PONO =$('#txtPONO').val(); var PONO =$('#txtPONO').val();
var igr =$('#hiddenIGRNO').val(); var igr =$('#hiddenIGRNO').val();
@ -5811,4 +5810,4 @@ else{
$('#hidecounter').val(counter); $('#hidecounter').val(counter);
} }
} }
</script> </script>

3
application/views/rawmaterialListing.php
View File

@ -41,11 +41,12 @@
{ {
foreach($userRecords as $record) foreach($userRecords as $record)
{ {
$date=date("Y-m-d");
?> ?>
<tr> <tr>
<td style="width:9%;"><u><a href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->MaterialCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?> - Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td> <td style="width:9%;"><u><a href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->MaterialCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM.'&date1='.$date ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?> - Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td>
<!--<td><u><a href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->RMCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toogle="tooltip" title="<?php echo $record->RMCode; ?> - Click here to view Material details"><?php echo $record->RMCode ?> </a></u></td>--> <!--<td><u><a href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->RMCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toogle="tooltip" title="<?php echo $record->RMCode; ?> - Click here to view Material details"><?php echo $record->RMCode ?> </a></u></td>-->
<td style="width:12%;"><?php echo $record->MaterialName ?></td> <td style="width:12%;"><?php echo $record->MaterialName ?></td>
<td style="width:10%;"><?php echo $record->MaterialType ?></td> <td style="width:10%;"><?php echo $record->MaterialType ?></td>