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

add ogr issues fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-07-05 17:59:49 +05:30
parent 3a5ccea227
commit 7ffb574094
2 changed files with 36 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
application/views/ogr.php
View File

@ -161,18 +161,10 @@ $Value="₹";
<label>Supplier/Customer</label> <label>Supplier/Customer</label>
<?php <?php
$options = array("0"=>'Select'); //$options = array("0"=>'Select');
//print_r( $options); //echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
?> ?>
</div> -->
</div>
-->
<div class="col-md-12"> <div class="col-md-12">
@ -180,8 +172,8 @@ $Value="&#8377;";
<div class="form-group"> <div class="form-group">
<label>OGR TYPE</label> <label>OGR TYPE</label>
<select id="ogrtype" > <select id="ogrtype" >
<option value="0">select option</option> <option value="0">select option</option>
<!-- <option value="1">UNKNOWN TYPE</option> -->
<option value="2">PO</option> <option value="2">PO</option>
<option value="3">Service</option> <option value="3">Service</option>
@ -194,23 +186,19 @@ $Value="&#8377;";
<div class="col-md-3"> <div class="col-md-3">
<label>Date</label> <label>Date</label>
<div class="form-group"> <div class="form-group">
<!-- <!--<?php
<?php //$data = array('name' => 'date','value' => set_value('date'),'id'=>'date', 'class' => 'form-control');
$data = array('name' => 'date','value' => set_value('date'),'id'=>'date', 'class' => 'form-control'); //echo form_input($data);
echo form_input($data); ?>-->
?> -->
<?php <?php
$data = array('name' => 'date','value' => set_value('date',$CurrentDate),'id'=>'date', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); $data = array('name' => 'date','value' => set_value('date',$CurrentDate),'id'=>'date', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-3">
</div>
<div class="col-md-3">
<label>Vehicle No</label> <label>Vehicle No</label>
<div class="form-group"> <div class="form-group">
@ -266,8 +254,8 @@ $Value="&#8377;";
<select id="ogrtype" > <select id="ogrtype" >
<option value="0">select option</option> <option value="0">select option</option>
<option value="2">PO</option> <option value="2">PO</option>
<option value="3">Service</option> <option value="3">Service</option>
</select> </select>
</div> </div>
@ -277,17 +265,9 @@ $Value="&#8377;";
<div class="col-md-12"> <div class="col-md-12">
<label>Supplier/Customer</label> <label>Supplier/Customer</label>
<?php <?php $options = array("0"=>'Select');
$options = array("0"=>'Select'); echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
//print_r( $options); ?>
echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
?>
</div> </div>
</div> </div>
@ -300,9 +280,6 @@ $Value="&#8377;";
<?php <?php
$options = array("0"=>'Select Invoice No'); $options = array("0"=>'Select Invoice No');
//print_r( $options);
echo form_dropdown('invno', $options,set_value(''),'id="invno"' ,'required="true"' ,'class="form-control select2'); echo form_dropdown('invno', $options,set_value(''),'id="invno"' ,'required="true"' ,'class="form-control select2');
?> ?>
@ -310,11 +287,10 @@ $Value="&#8377;";
<div class="col-md-3"> <div class="col-md-3">
<label>Item Code</label> <label>Item Code</label>
<div class="form-group"> <div class="form-group">
<?php
<?php
$data = array('name' => 'itemcode','value' => set_value('itemcode'),'id'=>'itemcode', 'class' => 'form-control'); $data = array('name' => 'itemcode','value' => set_value('itemcode'),'id'=>'itemcode', 'class' => 'form-control');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -323,11 +299,10 @@ $Value="&#8377;";
<div class="col-md-3"> <div class="col-md-3">
<label>Description</label> <label>Description</label>
<div class="form-group"> <div class="form-group">
<?php
<?php
$data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description', 'class' => 'form-control'); $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description', 'class' => 'form-control');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -336,11 +311,10 @@ $Value="&#8377;";
<div class="col-md-3"> <div class="col-md-3">
<label>Ordered Qty</label> <label>Ordered Qty</label>
<div class="form-group"> <div class="form-group">
<?php
<?php
$data = array('name' => 'qtyorder','value' => set_value('qtyorder'),'id'=>'qtyorder', 'class' => 'form-control'); $data = array('name' => 'qtyorder','value' => set_value('qtyorder'),'id'=>'qtyorder', 'class' => 'form-control');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -389,9 +363,6 @@ $Value="&#8377;";
<?php <?php
$options = array("0"=>'Select PONO'); $options = array("0"=>'Select PONO');
//print_r( $options);
echo form_dropdown('pono', $options,set_value('pono'),'id="pono"' ,'required="true"' ,'class="form-control select2'); echo form_dropdown('pono', $options,set_value('pono'),'id="pono"' ,'required="true"' ,'class="form-control select2');
?> ?>
@ -403,9 +374,6 @@ $Value="&#8377;";
<?php <?php
$options = array("0"=>'Select'); $options = array("0"=>'Select');
//print_r( $options);
echo form_dropdown('mrirno', $options,set_value('mrirno'),'id="mrirno"' ,'required="true"' ,'class="form-control select2'); echo form_dropdown('mrirno', $options,set_value('mrirno'),'id="mrirno"' ,'required="true"' ,'class="form-control select2');
?> ?>
@ -421,9 +389,6 @@ $Value="&#8377;";
<?php <?php
$options = array("0"=>'Select'); $options = array("0"=>'Select');
//print_r( $options);
echo form_dropdown('materialcode', $options,set_value('materialcode'),'id="materialcode"' ,'required="true"' ,'class="form-control select2'); echo form_dropdown('materialcode', $options,set_value('materialcode'),'id="materialcode"' ,'required="true"' ,'class="form-control select2');
?> ?>
@ -453,12 +418,12 @@ $Value="&#8377;";
<?php <?php
$options = array("0"=>'Select'); $options = array("0"=>'Select');
//print_r( $options);
if(!empty($storedmaterialcode)) if(!empty($storedmaterialcode))
{ {
foreach ($storedmaterialcode as $SID): foreach ($storedmaterialcode as $SID):
// echo $SID->ConfigValue;
$options[$SID->MaterialCode] = $SID->MaterialCode .'-'. $SID->MaterialName ; $options[$SID->MaterialCode] = $SID->MaterialCode .'-'. $SID->MaterialName ;
endforeach; endforeach;
@ -1371,12 +1336,4 @@ function Save(type)
} }
} }
</script> </script>

6
application/views/reportcashbook.php
View File

@ -112,7 +112,7 @@ div.dt-buttons {
<div class="info-box"> <div class="info-box">
<span class="info-box-icon bg-red" style="height: 117px;padding: 35px;width: 120px;"><i class="fa fa-hourglass-end"></i></span> <span class="info-box-icon bg-red" style="height: 117px;padding: 35px;width: 120px;"><i class="fa fa-hourglass-end"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-number" ><a href="<?php echo base_url().'report/Viewtoday' ?>" data-toggle="tooltip" title="Click here to View Today's Cashbook Report" ><?php echo "Today" ?></a></span> <span class="info-box-number" ><a href="<?php echo base_url().'report/daily_incexp' ?>" data-toggle="tooltip" title="Click here to View Today's Cashbook Report" ><?php echo "Today" ?></a></span>
<span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($strday_balances,2,'.',''); ?> </span> <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($strday_balances,2,'.',''); ?> </span>
<span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_in,2,'.',''); ?> </span> <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_in,2,'.',''); ?> </span>
<span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_ex,2,'.',''); ?> </span> <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_ex,2,'.',''); ?> </span>
@ -127,7 +127,7 @@ div.dt-buttons {
<div class="info-box"> <div class="info-box">
<span class="info-box-icon bg-aqua" style="height: 117px;padding: 35px;width: 120px;"><i<i class="fa fa-spinner"></span> <span class="info-box-icon bg-aqua" style="height: 117px;padding: 35px;width: 120px;"><i<i class="fa fa-spinner"></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-number"><a href="<?php echo base_url().'report/monthexpenses' ?>" data-toggle="tooltip" title="Click here to View Monthly Cashbook Report"><?php echo "This Month" ?></a></span> <span class="info-box-number"><a href="<?php echo base_url().'report/monthly_incexp' ?>" data-toggle="tooltip" title="Click here to View Monthly Cashbook Report"><?php echo "This Month" ?></a></span>
<span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($premonth_balances,2,'.',''); ?> </span> <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($premonth_balances,2,'.',''); ?> </span>
<span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_in,2,'.',''); ?></span> <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_in,2,'.',''); ?></span>
<span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_ex,2,'.',''); ?></span> <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_ex,2,'.',''); ?></span>
@ -142,7 +142,7 @@ div.dt-buttons {
<div class="info-box"> <div class="info-box">
<span class="info-box-icon bg-green" style="height: 117px;padding: 35px;width: 120px;"><i class="fa fa-industry" style="padding: 5px;"></i></span> <span class="info-box-icon bg-green" style="height: 117px;padding: 35px;width: 120px;"><i class="fa fa-industry" style="padding: 5px;"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-number"><a href="<?php echo base_url().'report/yearexpenses' ?>" data-toggle="tooltip" title="Click here to View Yearly Cashbook Report"><?php echo "This Year" ?></a></span> <span class="info-box-number"><a href="<?php echo base_url().'report/yearly_incexp' ?>" data-toggle="tooltip" title="Click here to View Yearly Cashbook Report"><?php echo "This Year" ?></a></span>
<span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($preyear_balances,2,'.',''); ?></span> <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($preyear_balances,2,'.',''); ?></span>
<span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_in,2,'.',''); ?></span> <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_in,2,'.',''); ?></span>
<span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_ex,2,'.',''); ?></span> <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_ex,2,'.',''); ?></span>