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

inward po code merged

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-12-18 19:16:05 +05:30
parent 997547b641
commit 33a76fe9f0
9 changed files with 17432 additions and 16979 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/cashbook.php
View File

@ -308,7 +308,7 @@ class cashbook extends BaseController
$words1 = array('2' => 'twenty',
'3' => 'thirty', '4' => 'fourty',
'5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
'8' => 'eighty', '9' =>'ninty');
'8' => 'eighty', '9' =>'ninety');
$words12 = array('11' => 'eleven',
'12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',

23
application/controllers/purchaseorder.php
View File

@ -391,7 +391,7 @@ class purchaseorder extends BaseController
$PAYTERM=$TER->PaymentTerms;
}
$data['getdata'] = $this->purchaseorder_model->getfunction($PONO);
$data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate();
$data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
$data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
@ -401,7 +401,7 @@ class purchaseorder extends BaseController
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$data['getdata'] = $this->purchaseorder_model->getfunction($PONO);
$data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form';
@ -410,11 +410,12 @@ class purchaseorder extends BaseController
else if($ReqType == REVENUE)
{
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form';
$this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL);
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
$this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';
$this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL);
}
else if($ReqType == IMPORT)
{
@ -2801,14 +2802,14 @@ $point=0;
'13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
'18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
'30' => 'thirty', '40' => 'forty', '50' => 'fifty',
'30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
'60' => 'sixty', '70' => 'seventy',
'80' => 'eighty', '90' => 'ninety','06'=>'Zero Six','01'=>'Zero One','02'=>'Zero Two'
,'03'=>'Zero Three','04'=>'Zero Four','05'=>'Zero Five','07'=>'Zero Seven','08'=>'Zero Eight','09'=>'Zero Nine');
$words1 = array('2' => 'twenty',
'3' => 'thirty', '4' => 'fourty',
'5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
'8' => 'eighty', '9' =>'ninty');
'8' => 'eighty', '9' =>'ninety');
$words12 = array('11' => 'eleven',
'12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
@ -2893,13 +2894,13 @@ $point=0;
'13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
'18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
'30' => 'thirty', '40' => 'forty', '50' => 'fifty',
'30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
'60' => 'sixty', '70' => 'seventy',
'80' => 'eighty', '90' => 'ninety');
$words1 = array('2' => 'twenty',
'3' => 'thirty', '4' => 'fourty',
'5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
'8' => 'eighty', '9' =>'ninty');
'8' => 'eighty', '9' =>'ninety');
$words12 = array('11' => 'eleven',
'12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',

2
application/controllers/supplier.php
View File

@ -431,7 +431,7 @@ class supplier extends BaseController
/**
* To view the Supplier information and load's the edit supplier screen
*/
function viewusupplier($SID = '')
function viewsupplier($SID = '')
{
$Payment = '';
if($SID == '')

6605
application/views/EditservicePurchaseorder.php Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

2
application/views/addnewIncomeExpense.php
View File

@ -97,7 +97,7 @@ function loadAccountType(id)
$('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
$.each(t,function(i,item){
if(item.type == 'EXPENSE')
if(item.type == 'PAYMENT')
{
$("#accode").append( $('<option></option>').val(item.code).html(item.name));
}

16963
application/views/alterpurchaseorder.php Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

10746
application/views/editRevenuepurchaseorder.php Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

2
application/views/payslipgenerateprint.php
View File

@ -200,7 +200,7 @@ if($RecCount > 0)
</td>
<td colspan="10">
<!-- <center><b><?php echo $CompanyName;?></b><br/><?php echo $CompanyAddress; ?><br/> PaySlip for the Month of <?php echo $PayOn ?></center> -->
<center><b>SIDDHARTH INDUSTRIES</b><br/> Survey No: 168/1C3,Pennalur Pet Road,Goonipalyam village, <br/>Uthukottai Taluk,Tiruvallur Dist, Chennai,Tamilnadu,Pin code : 602026. <br/> PaySlip for the Month of <?php echo $PayOn ?></center>
<center><b>RESICO INDUSTRIES</b><br/> Factory : 196/4 B, 126, Mettupalayam Village, <br/>Sriperumbudur Taluk, Kancheepuram Dist, Tamil Nadu, India. Pin code : 631604 . <br/> PaySlip for the Month of <?php echo $PayOn ?></center>
</td>
</tr>
<tr>

66
application/views/purchaseorder.php
View File

@ -204,7 +204,7 @@ function vaildateBeforeOpenModal()
};
var CollIndex = 0;
// alert(new Date(year,month,day));
// swal(new Date(year,month,day));
$(function()
{
@ -618,7 +618,7 @@ $('#EditPackagingType').change(function() {
// $('#drpFreight').change(function() {
// if($('#Rate').val() != '' && $('#MaterialCode').val() != "0" )
// {
// alert();
// swal();
// $('#txtFreight').val('');
// $('#txtAfterFreight').val('');
// selValue = $("#drpFreight").val() ;
@ -646,7 +646,7 @@ $('#EditPackagingType').change(function() {
// }
// else
// {
// alert('Please Select MaterialCode and Rate Field Value');
// swal('Please Select MaterialCode and Rate Field Value');
// $('#drpFreight').val("0");
// $('#Rate').focus();
// }
@ -950,7 +950,7 @@ function calculateDiscount(isEdit)
* To calcuate the Packaging */
function calculatePackaging(isEdit)
{
// alert(PackagingCalculation);
// swal(PackagingCalculation);
if(isEdit == '0')
{
if($('#MaterialCode').val() == "0")
@ -1757,14 +1757,14 @@ var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val());
var FreightValue = parseFloat($('#txtFreight').val());
var UOM = parseFloat($('#UOM').val());
var Quantity = parseFloat($('#Quantity').val());
//alert(FreightType);
//swal(FreightType);
var AfterFreight = 0.0;
if(FreightType == PercentageType)
{
//AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
if($(freightCalculation != 0 && '#txtAfterDiscount').val() == '')
{
//alert(freightCalculation);
//swal(freightCalculation);
swal('Please Enter the Discount value');
$('#txtFreight').val('');
$('#DiscountType').focus();
@ -1772,11 +1772,11 @@ var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val());
}
else{
var AfterDiscount =parseFloat($('#txtAfterDiscount').val());
//alert(AfterDiscount);
//swal(AfterDiscount);
//AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
if(freightCalculation == 0)
{
//alert('before value');
//swal('before value');
AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
}
else{
@ -1835,7 +1835,7 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
}
else
{
//alert('1');
//swal('1');
if($('#EditMaterialCode').val() == "0")
{
swal('Please Select the Material Code');
@ -1854,7 +1854,7 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
{
var basicValue = parseFloat($('#txtEditBasicValue').val());
var FreightType =$("#drpEditFreight").val();
//alert(FreightType);
//swal(FreightType);
if(FreightType == "0")
{
swal('Please select Freight Type');
@ -1867,7 +1867,7 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
var FreightValue = parseFloat($('#txtEditFreight').val());
var UOM = parseFloat($('#EditUOM').val());
var Quantity = parseFloat($('#EditQuantity').val());
//alert(FreightType);
//swal(FreightType);
var AfterFreight = 0.0;
// if(FreightType == PercentageType)
// {
@ -1878,7 +1878,7 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
//AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
if($(freightCalculation != 0 && '#txtEditAfterDiscount').val() == '')
{
//alert(freightCalculation);
//swal(freightCalculation);
swal('Please Enter the Discount value');
$('#txtEditFreight').val('');
$('#EditDiscountType').focus();
@ -1886,11 +1886,11 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
}
else{
var AfterDiscount =parseFloat($('#txtEditAfterDiscount').val());
//alert(AfterDiscount);
//swal(AfterDiscount);
//AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
if(freightCalculation == 0)
{
//alert('before value');
//swal('before value');
AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
}
else{
@ -1973,7 +1973,7 @@ AfterFreight = <?php echo FREIGHT_PERCENTAGE_AFTER;?>;}
{
StateTaxCheck = $("input:radio[name='Range']:checked").val();
$('#txtPoRange').val(StateTaxCheck) ;
//alert('Radio clicke:'+StateTaxCheck);
//swal('Radio clicke:'+StateTaxCheck);
if(StateTaxCheck == "0")
{
// style="display:none;"
@ -2122,10 +2122,10 @@ return true;
function validateEditExceedLimit()
{
//alert(" Edit Budget Check");
//swal(" Edit Budget Check");
var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
var basicAmountRate = parseFloat($('#txtEditBasicValue').val());
//alert(basicAmountRate);
//swal(basicAmountRate);
// var totalAmount = parseFloat($('#txtEditTotalOrderValue').val());
if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt)
@ -2177,7 +2177,7 @@ function calculateEditTaxValue()
var totvalue = parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(AfterCgst) ;
var tot = parseFloat(totvalue).toFixed(2);
//alert('tot:'+tot);
//swal('tot:'+tot);
return tot;
}
@ -2433,7 +2433,7 @@ function calculateEditTaxValue()
<div class="col-md-6" style="padding: 0px;">
<label>Revenue Type Options</label>
<label>Revenue Type Options<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<div class="form-group">
<?php
@ -3626,7 +3626,7 @@ $("#REVENUE").on("shown.bs.modal", function(e) {
$("#insurance").change(function(){
var ans=$("#insurance").val();
//alert(ans);
//swal(ans);
if(ans == 0){
$("#insurancenodiv").hide();
$("#insuranceno").val("");
@ -3640,7 +3640,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
$('#isEdit').val(1);
//alert(userid);
//swal(userid);
var tr= document.getElementById(userid);
var cellval = tr.cells;
var id= $('#Reqnumber'+userid).val();
@ -3870,7 +3870,7 @@ $('.AddRevenue').click(function(){
tinyMCE.triggerSave();
if(validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck())
{
//alert('inside Add');
//swal('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
@ -4006,7 +4006,7 @@ function populateValueMainFormForEditRevenueTax()
{
var rows = document.getElementById('revenueTax').rows.length;
//alert(rows);
//swal(rows);
var totBasicAmt = 0;
var totDiscountAmt = 0;
var totPackagingAmt = 0;
@ -4022,14 +4022,14 @@ function populateValueMainFormForEditRevenueTax()
var tr= document.getElementById(i);
//alert(tr);
//swal(tr);
if(tr != null)
{
cells = tr.getElementsByTagName('td');
var rowid = cells[0].innerHTML;
// alert(rowid);
// swal(rowid);
var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
var Sgst = $('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
@ -4039,7 +4039,7 @@ function populateValueMainFormForEditRevenueTax()
var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
//alert(TotalVal);
//swal(TotalVal);
totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
@ -4055,7 +4055,7 @@ function populateValueMainFormForEditRevenueTax()
} while (i < rows);
// alert(totOrderSummaryAmt);
// swal(totOrderSummaryAmt);
$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2) );
$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2) );
$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2) );
@ -4173,7 +4173,7 @@ function DeleteRow(rowid)
SelectedMaterialList.Mat.splice(i, 1);
}
});
// alert(SelectedMaterialCode);
// swal(SelectedMaterialCode);
if(DelRows != '')
{
DelRows = DelRows + ":" + rowid;
@ -4192,7 +4192,7 @@ function populateValueMainFormForDeleteItem(rowid)
{
// alert(rows);
// swal(rows);
var totBasicAmt = $('#txtTotBasicAmount').val();
var totDiscountAmt = $('#txtTotalDiscount').val();
var totPackagingAmt = $('#txtTotalPackaing').val();
@ -4212,7 +4212,7 @@ function populateValueMainFormForDeleteItem(rowid)
var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
//alert(TotalVal);
//swal(TotalVal);
var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
var Sgst =$('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
var Igst = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val();
@ -4261,7 +4261,7 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
var txtTotBasicAmount = $('#txtTotBasicAmount').val();
var txtTotalDiscount = $('#txtTotalDiscount').val();
var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount;
//alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt);
//swal(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt);
if(validate())
{
if(document.getElementById('revenueTax').rows.length < 3)
@ -4298,7 +4298,7 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
if(data)
{
$('#content').loader('hide');
swal(data);
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
//$('#SpcialInstruction').val('');
@ -4308,7 +4308,7 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
}
else
{
swal("Error");
alert("Error");
}
}