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

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

Browse Source
This commit is contained in:
bitbucket 2024-08-31 11:22:53 +05:30
commit 95d6d7a5f5
9 changed files with 5744 additions and 6050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Purchaseorder.php
View File

@ -563,7 +563,7 @@ $mpdf->use_kwt = true;
$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
$data['RequistionDetails'] = $ReqDetails;
$Status = "";
foreach ($data['RequistionDetails'] as $ReqDet) {
$Status = $ReqDet->Status;

94
app/Views/EditservicePurchaseorder.php
View File

@ -1074,28 +1074,21 @@ if (!empty($getlogpodtl)) {
</select>
</div>
</div>
<div class="form-row">
<div align="right">
<div class="form-group col-md-12 text-right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<div class="form-group col-md-12">
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
</div>
<div class="form-group col-md-1" align="right">
<?php } else { ?>
<div class="form-group col-md-12" align="right">
<?php } ?>
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
</div>
</div>
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
<?php } ?>
</div>
<div class="form-row">
<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
<?php } ?>
</div>
</div>
<div class="form-row">
<div class="table-responsive">
<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr>
<th>SNo</th>
<th>Requisition No</th>
@ -1108,11 +1101,11 @@ if (!empty($getlogpodtl)) {
<th>Tax Amount <?php echo "($INRSYM)" ?></th>
<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
<!-- <th>Actual Quantity</th>
<th>Received Quantity</th>
<th>Pending Quantity</th> -->
<th>Received Quantity</th>
<th>Pending Quantity</th> -->
<th>Action</th>
</tr>
</thead>
</thead>
<tbody id='ServiceAppend'>
<?php
@ -1228,8 +1221,9 @@ if (!empty($getlogpodtl)) {
}
?>
</tbody>
</table>
</div>
</table>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2">
<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
@ -1279,14 +1273,16 @@ if (!empty($getlogpodtl)) {
<!--start new fields 1 sep-->
<div class="form-group col-md-12">
<label>Description Of Service <span class="text-danger">*</label>
<div>
<?php
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div><!--end new fields 1 sep-->
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Scope Of Work</label>
<?php
@ -1294,8 +1290,8 @@ if (!empty($getlogpodtl)) {
echo form_textarea($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12" id="splpodiv">
<label>Special po Table List</label>
<table id="table2" class="table table-striped table-hover mb-0" style="font-size:12px;">
@ -1447,12 +1443,12 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn btn-soft-primary waves-effect waves-light Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
@ -1701,7 +1697,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
</div>
<div class="form-group col-md-3">
@ -1712,7 +1708,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
</div>
<div class="form-group col-md-3">
@ -1723,13 +1719,13 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<label>Service Description <span class="text-danger">*</span></label> <?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
</div>
<div class="form-group col-md-12">
<label>Service Description <span class="text-danger">*</span></label>
<?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div>
</div>
<div class="modal-footer">
@ -1839,7 +1835,7 @@ if (!empty($getlogpodtl)) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
?>
</div>
@ -1993,7 +1989,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
</div>
<div class="form-group col-md-3">
@ -2004,7 +2000,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
</div>
<div class="form-group col-md-3">
@ -2015,10 +2011,14 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-row">
<label>Service Description<span class="text-danger">*</span></label> <?php
$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
<div class="form-group col-md-12">
<label>Service Description<span class="text-danger">*</span></label>
<?php
$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
?>
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
</div>
</div>
<br />
</div>
@ -2113,7 +2113,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-3" id="ViewotherDescription">
<div class="form-group col-md-3" style="display: none;" id="ViewotherDescription">
<label>Item Name</label>
<div>
<?php
@ -2269,7 +2269,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
</div>
<div class="form-group col-md-3">
@ -2282,7 +2282,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-9" align="right">
<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
</div>
<div class="form-group col-md-3">

1449
app/Views/capitalpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

2230
app/Views/editRevenueAmendPO.php
View File

File diff suppressed because it is too large Load Diff

10
app/Views/editRevenuepurchaseorder.php
View File

@ -3652,7 +3652,7 @@ if (!empty($getlogpodtl)) {
<!-- Modal for Excise Duty Calculation-->
<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Excise Duty Calculation On</h4>
@ -3689,7 +3689,7 @@ if (!empty($getlogpodtl)) {
<!-- Modal for Vat Calculation -->
<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Vat Calculation On</h4>
@ -3719,7 +3719,7 @@ if (!empty($getlogpodtl)) {
<!-- Modal for CST Calculation -->
<div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">CST Calculation On</h4>
@ -3748,7 +3748,7 @@ if (!empty($getlogpodtl)) {
<!-- Revenue Special PO Modal Starts Here -->
<div id="EditRevenueSplPOModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Update <?php echo isset($getdata[0]->BillNo) ? $getdata[0]->BillNo : "" ?> Bill Details</h4>
@ -3816,7 +3816,7 @@ if (!empty($getlogpodtl)) {
<!-- Revenue bill Modal Starts Here -->
<div id="billModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Update Bill Details</h4>

2
app/Views/editServiceAmendPO.php
View File

@ -1002,7 +1002,7 @@ foreach ($PaymentTerms as $TER) {
<!-- Model for servicepo -->
<div class="modal fade" id="EDITSERVICE" role="dialog">
<div class="modal-dialog">
<div class="modal-dialog modal-lg">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:900px;">

3287
app/Views/importpo.php
View File

File diff suppressed because it is too large Load Diff

2618
app/Views/purchaseorder.php
View File

File diff suppressed because it is too large Load Diff

2102
app/Views/servicePurchaseorder.php
View File

File diff suppressed because it is too large Load Diff