Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
aadhavan valli 2024-09-26 17:27:24 +05:30
commit fb6d7e1d20
4 changed files with 2245 additions and 2127 deletions

File diff suppressed because it is too large Load Diff

View File

@ -915,10 +915,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> <!-- container --> </div> <!-- container -->
</div> <!-- content --> </div> <!-- content -->
</div> </div>
<div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
<div id="IMPORT" class="modal fade" align="center" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content" style="width:1060px;" >
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Import Purchase Order Item</h4> <h4 class="modal-title">Add Import Purchase Order Item</h4>
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal"
@ -1468,14 +1470,16 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
</div> </div>
<div class="form-row mt-3">
<div class="form-group col-md-11" style="margin-top:10px;"> <div class="form-group col-md-12">
<label>Import Description </label> <label>Import Description </label>
<?php <?php
$data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
</div>
</div> </div>
</div> </div>
@ -1488,10 +1492,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
<div id="editimportpomodel" class="modal fade" align="center" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content " style="width: 1060px;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Import Purchase Order Item</h4> <h4 class="modal-title">Edit Import Purchase Order Item</h4>
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal"
@ -1898,9 +1903,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
</div> </div>
</div> </div>
<br>
<!--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-4">
<label>Freight Type </label> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
@ -1912,7 +1918,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "'); echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-3" id="editTripsValue" style="display:none;"> <div class="form-group col-md-4" id="editTripsValue" style="display:none;">
<label>NO Of Trips</label> <label>NO Of Trips</label>
<?php <?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
@ -1920,7 +1926,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-4">
<label>Freight Rate </label> <label>Freight Rate </label>
<?php <?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
@ -1928,7 +1934,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?> ?>
</div> </div>
<div class="form-group col-md-3" style="padding-left: 0px;"> <div class="form-group col-md-4" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR; ?></label> <label>Freight Amt In <?php echo $INR; ?></label>
<?php <?php
$data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
@ -1946,12 +1952,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<br> <br>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-6">
<label>Duty Impact </label> <label>Duty Impact </label>
<!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/" ?></label> --> <!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/" ?></label> -->
</div>
<div class="form-group col-md-4">
<div> <div>
<?php <?php
$data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1959,8 +1962,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-4" style="margin-top: -4.8%"> <div class="form-group col-md-6">
<label>Quantity</label> <label>Quantity</label>
<div> <div>
<?php <?php
$data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()'); $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
@ -1968,15 +1971,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?> ?>
</div> </div>
</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-6">
<!-- Custom Duty Expenses --> <!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty($INR) /UOM" ?></label> <label><?php echo "Custom Duty($INR) /UOM" ?></label>
</div>
<div class="form-group col-md-4">
<div> <div>
<?php <?php
$data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1984,30 +1986,29 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row mt-2"> <div class="form-row mt-2">
<div class="form-group col-md-4"> <div class="form-group col-md-6">
<label><?php echo "Clearing Charges ($INR)"; ?></label>
<div> <div>
<!-- RMC Including Customers --> <?php
<label><?php echo "Clearing Charges ($INR)"; ?></label>
<?php
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()'); $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-6">
<label><?php echo "Nett per UOM($INR)"; ?></label>
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div> <div>
<?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);
@ -2042,7 +2043,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
<div class="form-row mt-3"> <div class="form-row mt-3">
<div class="form-row"> <div class="form-group col-md-12">
<label>Import Description :</label> <label>Import Description :</label>
<?php <?php
$data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff