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

Gas stock details changes-7 vadivel J 28-11-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-11-29 16:56:25 +05:30
parent 369446b2c6
commit c858617245
6 changed files with 7027 additions and 6739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/Amendmentpurchaseorder.php
View File

@ -337,13 +337,10 @@ class Amendmentpurchaseorder extends BaseController
// die; // die;
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
if(!empty($LastPO)){ if(!empty($LastPO)){
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }
}else{
$NewPO = "";
} }
if( $changeStatus == "ST026" || $changeStatus == "ST014"){ if( $changeStatus == "ST026" || $changeStatus == "ST014"){
@ -1026,6 +1023,7 @@ class Amendmentpurchaseorder extends BaseController
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO ='';
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }
@ -1418,8 +1416,8 @@ class Amendmentpurchaseorder extends BaseController
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
} }
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO = '';
$NewPO = '';
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }

10625
app/Views/alterpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

90
app/Views/editCapitalAmendPO.php
View File

@ -2050,13 +2050,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
</div> </div>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="border:solid black 1px; padding:1%;">
<div class="form-row" style="padding:0px;" id="EditModalImportTaxHide" style="display:none;"> <div class="form-row" style="padding:1%;" id="EditModalImportTaxHide" style="display:none;">
<br />
<div class="form-group col-md-6" style="padding:0px;"> <br/>
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Basic Price In<?php echo "($INR)" ?> <label for="EditBasicPriceTax">Basic Price In<?php echo "($INR)" ?></label>
</div> </div>
<!--<div class="form-group col-md-4"> <!--<div class="form-group col-md-4">
<div > <div >
@ -2075,7 +2077,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Landing charge<?php echo "$INR" ?> <label for="EditLandingCharge">Landing charge<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2092,7 +2095,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Assessable Value (A)<?php echo "$INR" ?> <label for="EditHighseas">Assessable Value (A)<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div style="display: none;"> <div style="display: none;">
@ -2111,7 +2114,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom duty (B) :<?php echo "$INR" ?> <label for="EditCustomduty"> Custom duty (B) :<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2131,7 +2135,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom ED_cess : (C)<?php echo "($INR)" ?> <label for="EditCustomEDcess"> Custom ED_cess : (C)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2148,7 +2153,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom S & H cess : (D)<?php echo "($INR)" ?> <label for="EditCustomSHcess"> Custom S & H cess : (D)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2164,10 +2170,13 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Subtotal: (E)<?php echo "($INR)" ?> <label for="EditAdditionalExciseduty"> Subtotal: (E)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div style="display: none"> <div style="display: none">
@ -2185,16 +2194,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Additional Excise duty : (g) --> <!-- Additional Excise duty : (g) -->
IGST on (E): (F) <label for="EditIgstInt">
<?php echo " ($INR)"; ?> IGST on (E): (F)
<?php echo " ($INR)"; ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2210,16 +2217,11 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<label for="EditGrossdutypayable">
Total Duty <?php echo "($INR)" ?> Total Duty <?php echo "($INR)" ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2232,7 +2234,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<!--Start of Adding of Frieght model--> <!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<span>Freight Type </span> <label for="drpamendFreight">Freight Type</label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) { if (!empty($FreightType)) {
@ -2244,14 +2246,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:none;"> <div class="form-group col-md-3" id="AmendTripsValue" style="display:none;">
<span>NO Of Trips</span> <label for="AmendNOOfTrips">NO Of Trips</label>
<?php <?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);'); $data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<span>Freight Rate </span> <label for="AmendtxtFreight">Freight Rate</label>
<?php <?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);'); $data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);');
echo form_input($data); echo form_input($data);
@ -2259,7 +2261,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-group col-md-3" style="padding-left: 0px;"> <div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt <?php echo "($INR)" ?></span> <label for="AmendtxtAfterFreight"> Freight Amt </label>
<?php <?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2269,13 +2271,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<div class="form-row"> <br>
<center> <label>Cost of the product Per UOM</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr /> <hr />
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="EditDutyImpact">
Duty Impact Duty Impact
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2284,7 +2289,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-4" style="margin-top: -4.8%"> <div class="form-group col-md-4" style="margin-top: -4.8%">
<span>Quantity</span> <label for="EditPurQuantity">Quantity</label>
<?php <?php
$data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
echo form_input($data); echo form_input($data);
@ -2296,7 +2301,10 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="EditCustomDutyExpenses">
Custom Duty<?php echo "($INR)/UOM" ?> Custom Duty<?php echo "($INR)/UOM" ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2309,7 +2317,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Clearing Charges <?php echo "($INR)" ?> <label for="EditClearingCharges"> Clearing Charges <?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2317,11 +2326,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4">
<!-- RMC Including Customers --> <div class="form-group col-md-4 " style="margin-top: -4.8%">
Nett per UOM<?php echo "($INR)"; ?> <label for="EditNett">Nett per UOM<?php echo "($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2340,7 +2347,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div>
<br>
<div class="form-row" style="text-align: left;"> <div class="form-row" style="text-align: left;">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
@ -2350,6 +2358,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>

1432
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

2
app/Views/editImportAmendPO.php
View File

@ -123,7 +123,7 @@ if (!empty($POMaster)) {
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
$PONO = $Req->PONO; $PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$ExchangeRate = number_format(($Req->ExchangeRate), 2); $ExchangeRate = number_format((float)($Req->ExchangeRate), 2);
$EDt = new DateTime($Req->ExchangeRateCalculatedon); $EDt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateCalculatedon = $EDt->format('d-m-Y'); $ExchangeRateCalculatedon = $EDt->format('d-m-Y');

1397
app/Views/editRevenuepurchaseorder.php
View File

File diff suppressed because it is too large Load Diff