Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
1b89275eab
@ -2813,7 +2813,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
function populateValueMainFormForEditServiceTax() {
|
function populateValueMainFormForEditServiceTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('ServiceTable').rows.length;
|
var rows = $('#ServiceTable tbody tr').length;
|
||||||
// alert(rows);
|
// alert(rows);
|
||||||
var editrow = parseFloat(rows) - 1;
|
var editrow = parseFloat(rows) - 1;
|
||||||
var TotCgst = 0;
|
var TotCgst = 0;
|
||||||
@ -3336,7 +3336,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
|
AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
|
||||||
|
|
||||||
//ServiceTable
|
//ServiceTable
|
||||||
var rows = document.getElementById('ServiceTable').rows.length;
|
var rows = $('#ServiceTable tbody tr').length;
|
||||||
|
|
||||||
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
|
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
|
||||||
|
|
||||||
|
|||||||
@ -4070,7 +4070,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
*/
|
*/
|
||||||
function populateValueMainFormForDeleteServiceTax(deletedRow) {
|
function populateValueMainFormForDeleteServiceTax(deletedRow) {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
|
|
||||||
var TotalOrderValueSummary = 0;
|
var TotalOrderValueSummary = 0;
|
||||||
|
|
||||||
|
|||||||
@ -4055,7 +4055,7 @@ Calculate Landing charge
|
|||||||
*/
|
*/
|
||||||
function populateValueMainFormForEditCapitalTax() {
|
function populateValueMainFormForEditCapitalTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
var TotalOrderValueSummary = 0;
|
var TotalOrderValueSummary = 0;
|
||||||
var basicfordometic = 0;
|
var basicfordometic = 0;
|
||||||
var qty = 0;
|
var qty = 0;
|
||||||
|
|||||||
@ -5380,7 +5380,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
*/
|
*/
|
||||||
function populateValueMainFormForDeleteServiceTax(deletedRow) {
|
function populateValueMainFormForDeleteServiceTax(deletedRow) {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
|
|
||||||
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
||||||
var TotalOrderValueSummary = 0;
|
var TotalOrderValueSummary = 0;
|
||||||
@ -6767,7 +6767,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
*/
|
*/
|
||||||
function populateValueMainFormForEditCapitalTax() {
|
function populateValueMainFormForEditCapitalTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
||||||
var TotalOrderValueSummary = 0;
|
var TotalOrderValueSummary = 0;
|
||||||
|
|
||||||
@ -6917,7 +6917,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
function populateValueMainFormForViewCapitalTax() {
|
function populateValueMainFormForViewCapitalTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
||||||
|
|
||||||
var TotalOrderValueSummary = 0;
|
var TotalOrderValueSummary = 0;
|
||||||
@ -8108,7 +8108,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
|
|
||||||
function populateValueMainFormForupdateCapitalTax() {
|
function populateValueMainFormForupdateCapitalTax() {
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
var TotalFreight = 0;
|
var TotalFreight = 0;
|
||||||
var i = 0;
|
var i = 0;
|
||||||
do {
|
do {
|
||||||
|
|||||||
@ -2786,7 +2786,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
|
|
||||||
|
|
||||||
function populateValueMainFormForEditImportTax() {
|
function populateValueMainFormForEditImportTax() {
|
||||||
var rows = document.getElementById('ImportTax').rows.length;
|
var rows = $('#ImportTax tbody tr').length;
|
||||||
var TotalLanding = 0;
|
var TotalLanding = 0;
|
||||||
var TotalCustom = 0;
|
var TotalCustom = 0;
|
||||||
var TotalCustomED = 0;
|
var TotalCustomED = 0;
|
||||||
|
|||||||
@ -16,9 +16,6 @@
|
|||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
@ -308,7 +305,8 @@ if (!empty($emppay)) {
|
|||||||
<tr>
|
<tr>
|
||||||
<td><?php echo number_format($history->Due_Amount, 2); ?></td>
|
<td><?php echo number_format($history->Due_Amount, 2); ?></td>
|
||||||
<td><?php echo number_format($history->Balance_Amount, 2); ?></td>
|
<td><?php echo number_format($history->Balance_Amount, 2); ?></td>
|
||||||
<td><?php $entryDate = new DateTime($history->Entry_Date); echo $entryDate->format('F j, Y, g:i A'); ?></td>
|
<td><?php $entryDate = new DateTime($history->Entry_Date);
|
||||||
|
echo $entryDate->format('F j, Y, g:i A'); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
@ -383,10 +381,6 @@ if (!empty($emppay)) {
|
|||||||
</div> <!-- content -->
|
</div> <!-- content -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// function duecalculation() {
|
// function duecalculation() {
|
||||||
// var totaldue = 0;
|
// var totaldue = 0;
|
||||||
// var loan = document.getElementById('Loan_Amount').value;
|
// var loan = document.getElementById('Loan_Amount').value;
|
||||||
|
|||||||
@ -1554,7 +1554,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-group col-md-12" align="right"><br />
|
<div class="form-group col-md-12"><br />
|
||||||
<div>
|
<div>
|
||||||
<input type="file" name="POFile" id="POFile">
|
<input type="file" name="POFile" id="POFile">
|
||||||
<?php if ($PrePOFile) { ?>
|
<?php if ($PrePOFile) { ?>
|
||||||
@ -2270,6 +2270,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
$('#BudgetType').attr("style", "pointer-events: none;");
|
$('#BudgetType').attr("style", "pointer-events: none;");
|
||||||
|
|
||||||
$('#EditRevenue').click(function () {
|
$('#EditRevenue').click(function () {
|
||||||
|
console.log("####");
|
||||||
tinyMCE.triggerSave();
|
tinyMCE.triggerSave();
|
||||||
if (validateEditRevenueTax() && validateEditExceedLimit()) {
|
if (validateEditRevenueTax() && validateEditExceedLimit()) {
|
||||||
var CostCode = $("#EditCostCenter").val();
|
var CostCode = $("#EditCostCenter").val();
|
||||||
@ -2407,7 +2408,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function populateValueMainFormForEditRevenueTax() {
|
function populateValueMainFormForEditRevenueTax() {
|
||||||
var rows = document.getElementById('revenueTax').rows.length;
|
var rows = $('#revenueTax tbody tr').length;
|
||||||
var totBasicAmt = 0;
|
var totBasicAmt = 0;
|
||||||
var totDiscountAmt = 0;
|
var totDiscountAmt = 0;
|
||||||
var totPackagingAmt = 0;
|
var totPackagingAmt = 0;
|
||||||
@ -2483,7 +2484,8 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<script>
|
<script>
|
||||||
function validateBudgetExceedLimit() {
|
function validateBudgetExceedLimit() {
|
||||||
//alert('inside validateBudgetExceedLimit function');
|
//alert('inside validateBudgetExceedLimit function');
|
||||||
var rows = document.getElementById('revenueTax').rows.length;
|
// var rows = document.getElementById('revenueTax').rows.length;
|
||||||
|
var rows = $('#revenueTax tbody tr').length;
|
||||||
var ReqType = '<?php echo REVENUE ?>';
|
var ReqType = '<?php echo REVENUE ?>';
|
||||||
for (i = 1; i < rows; i++) {
|
for (i = 1; i < rows; i++) {
|
||||||
var costcode = $('#costCode' + i).val();
|
var costcode = $('#costCode' + i).val();
|
||||||
|
|||||||
@ -4792,7 +4792,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
function populateValueMainFormForEditRevenueTax() {
|
function populateValueMainFormForEditRevenueTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('revenueTax').rows.length;
|
var rows = $('#revenueTax tbody tr').length;
|
||||||
//alert(rows);
|
//alert(rows);
|
||||||
var editrow = parseFloat(rows) - 1;
|
var editrow = parseFloat(rows) - 1;
|
||||||
//alert(editrow);
|
//alert(editrow);
|
||||||
@ -4979,7 +4979,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function validateBudgetExceedLimit() {
|
function validateBudgetExceedLimit() {
|
||||||
var rows = document.getElementById('revenueTax').rows.length;
|
var rows = $('#revenueTax tbody tr').length;
|
||||||
var ReqType = '<?php echo REVENUE ?>';
|
var ReqType = '<?php echo REVENUE ?>';
|
||||||
|
|
||||||
for (i = 1; i < rows; i++) {
|
for (i = 1; i < rows; i++) {
|
||||||
|
|||||||
@ -293,7 +293,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
||||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||||
//ServiceTable
|
//ServiceTable
|
||||||
var rows = document.getElementById('ServiceTable').rows.length;
|
var rows = $('#ServiceTable tbody tr').length;
|
||||||
|
|
||||||
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
|
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
|
||||||
|
|
||||||
@ -1876,7 +1876,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
|
|
||||||
function populateValueMainFormForEditServiceTax() {
|
function populateValueMainFormForEditServiceTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('ServiceTable').rows.length;
|
var rows = $('#ServiceTable tbody tr').length;
|
||||||
|
|
||||||
var TotCgst = 0;
|
var TotCgst = 0;
|
||||||
var TotSgst = 0;
|
var TotSgst = 0;
|
||||||
|
|||||||
@ -4626,7 +4626,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
//$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2);
|
//$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2);
|
||||||
//var Aft=$('#AfterLandingCharge').val();
|
//var Aft=$('#AfterLandingCharge').val();
|
||||||
//console.log(Aft);
|
//console.log(Aft);
|
||||||
var rows = document.getElementById('ImportTax').rows.length;
|
var rows = $('#ImportTax tbody tr').length;
|
||||||
var i = 0;
|
var i = 0;
|
||||||
do {
|
do {
|
||||||
i += 1;
|
i += 1;
|
||||||
@ -5051,7 +5051,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function populateValueMainFormForEditImportTax() {
|
function populateValueMainFormForEditImportTax() {
|
||||||
var rows = document.getElementById('ImportTax').rows.length;
|
var rows = $('#ImportTax tbody tr').length;
|
||||||
var TotalLanding = 0;
|
var TotalLanding = 0;
|
||||||
|
|
||||||
var TotalCustom = 0;
|
var TotalCustom = 0;
|
||||||
@ -5219,7 +5219,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
|
|
||||||
function populateValueMainFormForupdateImportTax() {
|
function populateValueMainFormForupdateImportTax() {
|
||||||
var rows = document.getElementById('ImportTax').rows.length;
|
var rows = $('#ImportTax tbody tr').length;
|
||||||
var TotalFreight = 0;
|
var TotalFreight = 0;
|
||||||
var i = 0;
|
var i = 0;
|
||||||
do {
|
do {
|
||||||
|
|||||||
@ -315,6 +315,7 @@
|
|||||||
<select name="status" id="non_igr_status" class="form-control">
|
<select name="status" id="non_igr_status" class="form-control">
|
||||||
<option value="Draft">Draft</option>
|
<option value="Draft">Draft</option>
|
||||||
<option value="Completed">Completed</option>
|
<option value="Completed">Completed</option>
|
||||||
|
<option value="Canceled">Canceled</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -3923,7 +3923,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function populateValueMainFormForEditImportTax() {
|
function populateValueMainFormForEditImportTax() {
|
||||||
var rows = document.getElementById('ImportTax').rows.length;
|
var rows = $('#ImportTax tbody tr').length;
|
||||||
var TotalLanding = 0;
|
var TotalLanding = 0;
|
||||||
var TotalHighseas = 0;
|
var TotalHighseas = 0;
|
||||||
var TotalCustom = 0;
|
var TotalCustom = 0;
|
||||||
|
|||||||
@ -3683,7 +3683,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
function populateValueMainFormForEditRevenueTax() {
|
function populateValueMainFormForEditRevenueTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('revenueTax').rows.length;
|
var rows = $('#revenueTax tbody tr').length;
|
||||||
//alert(rows);
|
//alert(rows);
|
||||||
var totBasicAmt = 0;
|
var totBasicAmt = 0;
|
||||||
var totDiscountAmt = 0;
|
var totDiscountAmt = 0;
|
||||||
|
|||||||
@ -2096,7 +2096,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
function populateValueMainFormForEditServiceTax() {
|
function populateValueMainFormForEditServiceTax() {
|
||||||
|
|
||||||
var rows = document.getElementById('serviceTax').rows.length;
|
var rows = $('#serviceTax tbody tr').length;
|
||||||
|
|
||||||
var TotCgst = 0;
|
var TotCgst = 0;
|
||||||
var TotSgst = 0;
|
var TotSgst = 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user