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']['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 */
/* Location: ./application/config/database.php */

1257
application/controllers/batchcard.php
View File

File diff suppressed because it is too large Load Diff

107
application/controllers/purchaseorder.php
View File

@ -1067,18 +1067,19 @@ class purchaseorder extends BaseController
$DeliveryAddr = $this->input->post('txtDeliveryAddress');
$dt = $this->input->post('Deliverydt');
$DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1){
$Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby');
}
else{
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$b4supplier=$this->input->post('b4supplier');
$b4date=$this->input->post('b4podate');
$b4podate = $this->getDateformat($b4date);
if($DeliveryOption==1){
$Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby');
}
else{
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$b4supplier=$this->input->post('b4supplier');
$b4date=$this->input->post('b4podate');
$b4podate = $this->getDateformat($b4date);
$Modeofshipment=$this->input->post('editmodeofshipment');
$supplierreference=$this->input->post('editsupplierreference');
@ -1087,10 +1088,11 @@ class purchaseorder extends BaseController
$fincap=$this->input->post('editfincap');
$revenuetype=$this->input->post('PoTypeOptions');
$insurancestatus=$this->input->post('insurancestatus');
if($insurancestatus == 1){
$insuranceno=$this->input->post('insuranceno');
$insuranceno=$this->input->post('insuranceno');
}else{
$insuranceno="";
$insuranceno="";
}
$POType = $this->input->post('POType');
@ -1111,7 +1113,7 @@ class purchaseorder extends BaseController
$updateddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment');
$OtherPayment=$this->input->post('Otherpayment');
$Local_Interstate=$this->input->post('Range');
$Qualitycheck=1;
@ -1121,27 +1123,28 @@ class purchaseorder extends BaseController
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW;
$LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate )
{
{
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4podate,'NewValue'=>$PODate,'Entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo);
}
if(!empty($newSupId[0] ))
{
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4supplier,'NewValue'=>$newsup,'Entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
}
}
if(!empty($newSupId[0] ))
{
if($newSupId[0] != $b4supplier)
{
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4supplier,'NewValue'=>$newsup,'Entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
}
for ($i = 1; $i <= $RowCount; $i++)
{
for($i = 1; $i <= $RowCount; $i++)
{
$MaterialCode = $this->input->post('materialCode'.$i);
$Quantity = $this->input->post('quantity'.$i);
@ -1178,41 +1181,37 @@ class purchaseorder extends BaseController
if($Quantity != $b4qty)
{
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
if($itemRate != $b4rate)
if($itemRate != $b4rate)
{
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4rate,'NewValue'=>$itemRate,'Entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4rate,'NewValue'=>$itemRate,'Entity'=>'Rate Changed');
$this->purchaseorder_model->insertlogpo($logpo);
}
$SkipInsert = "False";
if( count($comma_separated) > 0)
{
$SkipInsert = "False";
if( count($comma_separated) > 0)
{
for($j = 1; $j < count($comma_separated); $j++)
{
$deletedRow = $comma_separated[$j] ;
if($deletedRow == $i )
{
$SkipInsert = "True";
break;
}
if($deletedRow == $i )
{
$SkipInsert = "True";
break;
}
}
}
}
}
$ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updateReqDetails($Reqnumber,$MaterialCode,$ReqDetails);
$recqty=0;
@ -1223,7 +1222,7 @@ class purchaseorder extends BaseController
$recqty= $Quantity;
$IGRD= $this->purchaseorder_model->getIGRDetails($PONO);
$j = $i-1;
$j = $i-1;
$IGRDs = array('QuantityAsPerInvoice'=>$Quantity,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
@ -1253,9 +1252,7 @@ class purchaseorder extends BaseController
}
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if(count($isExists) == 0)
{
}
{}
else
{

30
application/controllers/rawmaterialdetails.php
View File

@ -168,6 +168,19 @@ else
$ConversionFactor = $this->input->post('conversionfactor');
$cfuom = $this->input->post('conversionfactorUOM');//print_r( $ConversionFactorUOM);
$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');
$chked = $this->input->post('isactive');
@ -214,7 +227,7 @@ else
$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);
if($result > 0)
@ -245,6 +258,7 @@ else
$RawMaterialID = $_GET['RID'];
$MaterialType = $_GET['MType'];
$UOM = $_GET['UOM'];
$currentdate=$_GET['date1'];
}
else
{
@ -252,6 +266,7 @@ else
}
$data['materialDetails'] = $this->rawmaterialdetails_model->getMaterialDetails($RawMaterialID);
$data['currentstock'] = $this->rawmaterialdetails_model->getMaterialstock($RawMaterialID, $currentdate);
$data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType );
$data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory);
$data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM);
@ -319,6 +334,18 @@ else
$ConversionFactor = $this->input->post('conversionfactor');
$cfuom = $this->input->post('conversionfactorUOM');
$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');
$chked = $this->input->post('isactive');
if($asset == '0')
@ -365,6 +392,7 @@ else
$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,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
if($result == true)

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

33
application/models/rawmaterialdetails_model.php
View File

@ -113,6 +113,39 @@ class rawmaterialdetails_model extends CI_Model
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()
{
$this->db->select('AssetCode,AssetName');

5
application/views/MaterialHistory.php
View File

@ -52,9 +52,10 @@ table.dataTable thead > tr > td.sorting {
<!-- TABLE: LATEST ORDERS -->
<div class="box box-info">
<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
//print_r($firstinvoice);
if($this->input->post('item_name')){
$it=$this->input->post('item_name');
echo $it;

218
application/views/addRawMaterial.php
View File

@ -6,6 +6,15 @@
outline: 1px solid slategrey;
}
</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>
<div class="content-wrapper" style="min-height: 537px;">
<!-- Content Header (Page header) -->
@ -30,7 +39,7 @@
<!-- form start -->
<form id="addUser" action="<?php echo base_url() ?>rawmaterialdetails/addNewRawMaterial" method="post" role="form">
<form id="addUser" action="<?php echo base_url() ?>rawmaterialdetails/addNewRawMaterial" method="post" role="form">
<div class="box-body">
<div class="col-md-12">
<div class="col-md-3">
@ -56,11 +65,10 @@
}
}
?>
</select>
</select>
</div>
</div>
<div class="col-md-3" >
<div class="form-group autoSearch" id="mc">
<label for="Matcate">Material Caterogy</label><font color="Red">*</font>
@ -69,7 +77,7 @@
<!-- <input type="text" class="form-control" id="HideMatCate" name="HideMatCate" readonly> -->
</div>
</div>
<!--<div class="col-md-3">
<div class="form-group">
<label for="MaterialCategory">Material Category</label><font color="Red">*</font>
@ -155,7 +163,7 @@
<div class="col-md-3">
<div class="form-group">
<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 class="col-md-3">
@ -185,6 +193,27 @@
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
</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="form-group">
<label for="remarks">Remarks</label>
@ -198,7 +227,7 @@
</div>
</div>
</div>
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
@ -209,7 +238,7 @@
</form>
</div>
</div>
</div>
</div>
</section>
</div>
@ -218,45 +247,45 @@
$(document).ready(function(){
$("#MaterialType").select2();
// $("#MaterialCategory").select2();
$("#UOM").select2();
$("#Assetcode").select2();
$("#Costcenter").select2();
$("#conversionfactorUOM").select2();
$("#MaterialType").select2();
// $("#MaterialCategory").select2();
$("#UOM").select2();
$("#Assetcode").select2();
$("#Costcenter").select2();
$("#conversionfactorUOM").select2();
$('#MatCate').autocomplete({
onSearchStart: function (query) {
$('#MatCate').autocomplete("option", "minLength", 0);
},
serviceUrl: "<?php echo base_url();?>rawmaterialdetails/autocomplete",
onSelect: function (suggestion) {
var data = suggestion.ConfigValue;
var selectedvalue = $('input[name=MatCate]').val();
if(selectedvalue=='Spares')
{
$('#MatCate').autocomplete({
//$('#contest_num').hide();
$('#Assetcode').prop('disabled', false);
$('#Costcenter').prop('disabled', false);
}
else{
onSearchStart: function (query) {
$('#Assetcode').prop('disabled', 'disabled');
$('#Costcenter').prop('disabled', 'disabled');
}
$('#MatCate').autocomplete("option", "minLength", 0);
},
serviceUrl: "<?php echo base_url();?>rawmaterialdetails/autocomplete",
onSelect: function (suggestion) {
var data = suggestion.ConfigValue;
var selectedvalue = $('input[name=MatCate]').val();
if(selectedvalue=='Spares')
{
//alert('good');
//$('#contest_num').hide();
$('#Assetcode').prop('disabled', false);
$('#Costcenter').prop('disabled', false);
}
else{
// // alert('bad');
$('#Assetcode').prop('disabled', 'disabled');
$('#Costcenter').prop('disabled', 'disabled');
}
}
});
}
});
});
function isNumberKey(evt)
{
var charCode = (evt.which) ? evt.which : evt.keyCode;
@ -266,9 +295,9 @@ function isNumberKey(evt)
return true;
}
function BlockSpecial(evt) {
function BlockSpecial(evt) {
var charCode;
// if (window.event)
// charCode = window.event.keyCode; //for IE
@ -334,71 +363,58 @@ function Validate()
return false;
}
}
$('#MaterialName').change(function() {
var materialname = $('#MaterialName').val();
//material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g,'');
$('#content').loader('show');
var materialname = $('#MaterialName').val();
//material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g,'');
$('#content').loader('show');
$.ajax({
data:{id:material},
type:"POST",
url:"<?php echo base_url();?>rawmaterialdetails/checkmaterial",
success:function(data) {
$.ajax({
data:{id:material},
type:"POST",
url:"<?php echo base_url();?>rawmaterialdetails/checkmaterial",
success:function(data) {
var count = data.length;
var count = data.length;
if(count >2 ){
if(count >2 ){
$('#content').loader('hide');
swal({
title: "'" + materialname + " already existed ! ",
// type: "info",
showCancelButton: true,
confirmButtonClass: "btn-danger",
confirmButtonText: "Material Details!",
closeOnConfirm: false
},
function(){
dat = JSON.parse(data);
var related_name = "";
$.each(dat,function(i,obj){
related_name += obj.MaterialCode +" - "+ obj.MaterialName+" - "+obj.MaterialType+" - "+obj.Category+"\n";
$('#content').loader('hide');
swal({
title: "'" + materialname + " already existed ! ",
// type: "info",
showCancelButton: true,
confirmButtonClass: "btn-danger",
confirmButtonText: "Material Details!",
closeOnConfirm: false
},
function(){
dat = JSON.parse(data);
var related_name = "";
$.each(dat,function(i,obj){
related_name += obj.MaterialCode +" - "+ obj.MaterialName+" - "+obj.MaterialType+" - "+obj.Category+"\n";
});
swal( "'" + materialname + "' - related materials are ," , related_name);
$("#MaterialName").focus();
});//sweet alert closed....
}
});
else{
$('#content').loader('hide');
}
}
});
});
swal( "'" + materialname + "' - related materials are ," , related_name);
$("#MaterialName").focus();
// 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>
});//sweet swal closed....
}
else{
$('#content').loader('hide');
}
}
});
});
</script>

91
application/views/editRawmaterial.php
View File

@ -13,6 +13,10 @@ $conversionactor ='';
$RMCode = '';
$HSNcode = '';
$IsActive = '';
$openstock='';
$date='';
$reorder='';
$total='0.00';
if(!empty($materialDetails))
{
@ -30,7 +34,10 @@ if(!empty($materialDetails))
$conversionfactor = $MD->ConversionFactorUnit;
$conversionfactorUOM = $MD->ConversionFactorUOM;
$RMCode = $MD->RMCode;
$HSNcode = $MD->HSNCODE;
$HSNcode = $MD->HSNCODE;
$swal=$MD->stock;
$date=$MD->stockdate;
$reorder=$MD->reorder;
$chk = $MD->IsActive;
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>
.autocomplete-suggestion{
cursor:pointer;
@ -138,7 +178,7 @@ if(!empty($materialDetails))
</div>
</div>
<div class="col-md-12">
@ -183,8 +223,49 @@ if(!empty($materialDetails))
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
</div>
</div>
<div class="col-md-6">
<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="form-group">
<label for="remarks">Remarks</label>
<input type="text" class="form-control" id="remarks" name="remarks" maxlength="255" value="<?php echo $remarks;?>">
@ -196,7 +277,7 @@ if(!empty($materialDetails))
<input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive; ?> >
</div>
</div>
</div>
</div>
</div>

89
application/views/editRevenuepurchaseorder.php
View File

@ -1,6 +1,6 @@
<?php $ReqType ='';
$CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('d-m-Y');
$MaxPoDate = '';
$AvlAmount = 0;
@ -103,9 +103,10 @@ $otherPayment = $Req->PaymentOtherDescription;
$insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
$BudgetType = $Req->BudgetType;
$IGRNO = $Req->IGRNO;
$IGRNO =$Req->IGRNO;
}
}
if(!empty($RequistionDetails))
{
foreach ($RequistionDetails as $ReqDet)
@ -126,7 +127,7 @@ $update=$values->FirstName;
?>
<style>
#packagingcalmodel {
#packagingcalmodel {
margin-top:200px;
z-index: 1080 !important;
}
@ -202,6 +203,7 @@ else
{
$('#splpodiv').hide();
}
var update = '<?php echo json_encode($update)?>';
if(update !='null')
{
@ -211,7 +213,7 @@ else
{
$('#editpodiv').hide();
}
/*****************************/
$('#PoTypeOptions').attr("style", "pointer-events: none;");
if(DelOpt=="0"){
$('#Deliverydtdiv').show();
@ -234,8 +236,6 @@ else{
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
// var insurancestatus = <?php echo $insurencestatus;?>;
// var insuranceno = <?php echo $insurenceno;?>;
if(insurancestatus == 1)
{
@ -1770,7 +1770,6 @@ else if( $('#txtViewFreight').val() != "0" && $('#txtViewFreight').val() != '')
var FreightValue = parseFloat($('#txtViewFreight').val());
var UOM = parseFloat($('#ViewUOM').val());
var Quantity = parseFloat($('#ViewQuantity').val());
var AfterFreight = 0.0;
// if(FreightType == PercentageType)
// {
@ -2181,6 +2180,7 @@ return tot;
<div style="border:2px solid #333">
<div id="content"></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>
<div class="container-fluid">
<div class="row">
@ -4046,11 +4046,22 @@ return tot;
<div class="col-md-12"><!-- <label>Special po Table List</label> -->
<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" >
<input type="button" class="btn btn-primary" id ="addmorebutton" value=" ADD FILES..">
</div>
<div id="newdiv"></div>
<input type="hidden" name="hidecounter" id="hidecounter" 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 (!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="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>
<?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>
@ -4142,8 +4143,6 @@ return tot;
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<td><?php echo $oldpo->LineItemNo;?></td>
<td><?php echo $oldpo->Entity?></td>
<?php if($oldpo->Entity =='PO DateChanged'){
@ -4402,7 +4401,7 @@ return tot;
var quantity = parseFloat($("#Quantity").val()).toFixed(2);
var itemRate = parseFloat($("#Rate").val()).toFixed(2);
var PER = $("#AddPer").val();
if(PER == '')
{
PER = $("#UOM").val();
@ -4431,7 +4430,7 @@ return tot;
var Insval = $("#txtInsurance").val();
var TotalOrderValue = $("#txtTotalOrderValue").val();
var service_description = $("#Add_Service_Description").val();
var TotalTaxValue = calculateTaxValue();
@ -4502,7 +4501,7 @@ return tot;
tinyMCE.triggerSave();
if(validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck())
{
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
@ -4604,7 +4603,7 @@ return tot;
});
$('.ViewRevenue').click(function(){
var FreightType = $("#drpViewFreight").val();
@ -4612,10 +4611,10 @@ return tot;
var AfterFreightVal = $("#txtViewAfterFreight").val();
var NoOfTrip = $("#ViewNOOfTrips").val();
var Cgst = $("#ViewAfterCGST").val();
var Sgst = $("#ViewAfterSGST").val();
var Igst = $("#ViewAfterIGST").val();
if(FreightType != 'PER TRIP'){
NoOfTrip=0;
}
@ -4624,6 +4623,9 @@ return tot;
var TotalOrderValue = $("#txtViewTotalOrderValue").val();
var tr= document.getElementById(userid);
var cellval = tr.cells;
@ -4695,9 +4697,9 @@ return tot;
{
var rows = document.getElementById('revenueTax').rows.length;
var editrow = parseFloat(rows)-1;
var totBasicAmt = 0;
var totDiscountAmt = 0;
var totPackagingAmt = 0;
@ -4713,14 +4715,14 @@ return tot;
var tr= document.getElementById(i);
if(tr != null)
{
cells = tr.getElementsByTagName('td');
var rowid = cells[0].innerHTML;
var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
var Sgst = $('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
@ -4730,8 +4732,7 @@ return tot;
var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
totDiscountAmt = parseFloat(totDiscountAmt ) + parseFloat(Discount);
@ -4935,7 +4936,7 @@ return tot;
{
var id = [];
var DelRows = $('#txtDeletedRow').val();
var tr = document.getElementById(rowid);
// var cellval = tr.cells;
var MaterialCode = $('#materialCode'+rowid).val();
@ -4975,6 +4976,7 @@ return tot;
});
if(result == '0')
{
var DelRows = $('#txtDeletedRow').val();
@ -4989,7 +4991,6 @@ return tot;
}
$('#txtDeletedRow').val(DelRows);
}
// To delete the value from Tables
else if(result == '1')
{
@ -5024,6 +5025,7 @@ return tot;
}});
}
//populateValueMainFormForDeleteItem(rowid);
}
@ -5050,7 +5052,7 @@ return tot;
var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
var Sgst =$('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
var Igst = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val();
@ -5101,6 +5103,7 @@ return tot;
var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>';
var txtTotalbasicamount = $('#txtTotBasicAmount').val();
var totaldiscount = $('#txtTotalDiscount').val();
if(validate())
{
if(document.getElementById('revenueTax').rows.length < 2)
@ -5509,7 +5512,6 @@ return tot;
$('#ViewdeptName').val($('#departmentName'+userid).val());
$("#ViewCostCenter").val($('#costCode'+userid).val());
$('#ViewAvlBudAmt').val(AvlBudAmt);
//
$('#ViewItemName').val($('#materialName'+userid).val());
$('#ViewUOM').val($('#uom'+userid).val());
@ -5585,8 +5587,6 @@ return tot;
var param1 = $('#hidebillno').val();
var param2 = $('#hideoldfile').val();
// var filename = $("#billimag").val();
// filename = filename.split('\\');
formData.append('file',file);
formData.append('param1',param1);
formData.append('param2',param2);
@ -5662,10 +5662,9 @@ return tot;
var formData = new FormData();
var file = $("#images"+counter).prop('files')[0];
var PONO =$('#txtPONO').val();
var igr =$('#hiddenIGRNO').val();
formData.append('file',file);
formData.append('PONO',PONO);
formData.append('count',counter);
@ -5735,7 +5734,7 @@ else{
var div = document.createElement('div');
div.id = "divid";
div.className="row";
div.innerHTML='<div class="col-md-12">'+
// '<div class="col-md-3">'+
// '<label>File Name</label>'+
@ -5793,13 +5792,13 @@ else{
var number = id.replace(/[^0-9]+/ig,"");
if(size > 2100000){
swal('Sorry Your File is Large To 2MB');
removeRow(id);
//$('input[name = browseFiles'+number+']').val(' ');
}else {
var name = $('input[name='+id+']')[0].files[0].name;
$("#maint_filename"+number).val(name);
}
}
@ -5811,4 +5810,4 @@ else{
$('#hidecounter').val(counter);
}
}
</script>
</script>

3
application/views/rawmaterialListing.php
View File

@ -41,11 +41,12 @@
{
foreach($userRecords as $record)
{
$date=date("Y-m-d");
?>
<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 style="width:12%;"><?php echo $record->MaterialName ?></td>
<td style="width:10%;"><?php echo $record->MaterialType ?></td>