@@ -765,19 +783,28 @@ $(document).ready(function () {
$WrkStatus);
- //print_r( $options);
+
if(!empty($WorkStatus))
{
+
+ foreach ($WorkStatus as $WorkSID):
+ if($WrkStatus==$WorkSID->StatusCode){
+ $optionsWork[$WorkSID->StatusCode] = $WorkSID->StatusName;
+ }
+
+
+ endforeach;
foreach ($WorkStatus as $SID):
-
- $options[$SID->ConfigValue] = $SID->ConfigValue;
+ if($WrkStatus!=$SID->StatusCode){
+ $optionsWork[$SID->StatusCode] = $SID->StatusName;
+ }
+
endforeach;
}
- echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
+ echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
?>
@@ -804,45 +831,43 @@ $(document).ready(function () {
-
- Payable Terms
-
-
-
-
- Payable AT
-
- 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT', 'class' => 'form-control' ,'required' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
- Payment Date
-
- |
- "Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?> |
-
- "Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
+
+
+
+ PaymentID){
+
+ $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms;
+
+ }
+ endforeach;
+ foreach ($Payment as $pay1):
+
+ if($Terms!=$pay1->PaymentID){
+
+ $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms;
+
+ }
+ endforeach;
+ }
- |
-
-
+ echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+
@@ -862,237 +887,257 @@ $(document).ready(function () {
-
-
-
-
- 'Select Req No');
- if(!empty($RequistionDetails))
- {
- foreach ($RequistionDetails as $SID):
- $RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
- endforeach;
- }
-
- echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
+
+
+
+
+ 'Select Req No');
+ if(!empty($RequistionDetails))
+ {
+ foreach ($RequistionDetails as $SID):
+ $RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+ echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
- ?>
-
-
-
-
-
-
- 'deptName','value' => set_value('deptName'),'id'=>'deptName', 'class' => 'form-control');
- echo form_input($data);
- ?>
-
-
-
-
-
- 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true');
- echo form_input($data);
-
- ?>
-
-
-
-
-
- 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- 'Item Code');
- //print_r( $options);
-
-
-
- echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
- ?>
-
-
-
-
-
- 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName', 'class' => 'form-control' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
- 'UOM','value' => set_value('UOM'),'id'=>'UOM', 'class' => 'form-control' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
- 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control' );
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
- echo form_input($data);
- ?>
-
-
-
-
-
- 'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
- echo form_input($data);
- ?>
-
-
-
-
-
- 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
-
- Service Tax @14% :
-
-
-
-
- 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax', 'class' => 'form-control num' ,'placeholder' => 'After Service Tax','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- Edu. cess @2% on service Tax :
-
-
-
-
-
- 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess', 'class' => 'form-control num' ,'placeholder' => 'After Edu.','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
-
- Sec. & Higher Edu. cess @1 % on service Tax :
-
-
-
-
-
- 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax', 'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- Krishi Kalyan tax @.5 % on Basic Amount:
-
-
-
-
-
- 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax', 'class' => 'form-control num' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- Swachh Bharat tax @.5 % on Basic Amount:
-
-
-
-
-
- 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax', 'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
-
-
-
-
- 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
- echo form_input($data);
- ?>
+ ?>
+
-
-
-
-
+
+
+
+
+ 'deptName','value' => set_value('deptName'),'id'=>'deptName', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+
+ ?>
+
+
+
+
+
+ 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+ 'Item Code');
+ //print_r( $options);
+
+
+
+ echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
+
+ ?>
+
+
+
+
+
+ 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'UOM','value' => set_value('UOM'),'id'=>'UOM', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ CGST In %
+
+
+
+
+ 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst', 'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ SGST In %
+
+
+
+
+
+ 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst', 'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ IGST In %
+
+
+
+
+
+ 'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst', 'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue', 'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
-
-
+
@@ -1144,7 +1189,7 @@ $(document).ready(function () {
-
+
'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true');
@@ -1175,7 +1220,16 @@ $(document).ready(function () {
?>
-
+
+ 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
-
+
'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' );
+ $data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
- ?>
+ ?>
+
-
-
-
+
-
+
-
+
-
-
-
-
- Service Tax @14% :
-
-
-
-
- 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax', 'class' => 'form-control num','readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
+
+
+
+ CGST In %
+
+
+
+
+
+ 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst', 'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ SGST In %
+
+
+
+
+
+ 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst', 'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ IGST In %
+
+
+
+
+
+ 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst', 'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+ >
+
+
+
+ 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances', 'class' => 'form-control num','onchange'=>'EditRatechange()');
+ echo form_input($data);
+ ?>
+
+
+
-
- Edu. cess @2% on service Tax :
-
-
-
-
-
- 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
-
- Sec. & Higher Edu. cess @1 % on service Tax :
-
-
-
-
-
- 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- Krishi Kalyan tax @.5 % on Basic Amount:
-
-
-
-
-
- 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
-
- Swachh Bharat tax @.5 % on Basic Amount:
-
-
-
-
-
- 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
>
@@ -1324,16 +1389,17 @@ $(document).ready(function () {
+
-
-
+
@@ -1350,42 +1416,63 @@ $(document).ready(function () {
| SNo |
Requisition No |
- Item Name |
+ Item Code |
+ Item Description |
Quantity |
- UOM |
+ UOM |
Rate |
Basic Amount |
Tax Amount |
Total Order Amount |
+ Actual Quantity |
+ Received Quantity |
+ Pending Quantity |
Action |
Schedule_Type!='Recurring'){
+ $FrequencyNo=intval(1);
+ $Frequency='One Time';
+ }
+ else{
+ $FrequencyNo=$record->NumberOfService;
+ $Frequency=$record->Service_Period;
+ }
+
?>
|
ReqNo ?> |
- MaterialName ?> |
+ MaterialCode ?> |
+ ServiceMaterialDescription ?> |
Quantity ?> |
- UOM ?> |
+ UOM ?> |
+
Rate ?> |
- BasicValue ?> |
+ BasicValue * $FrequencyNo, 2, '.', ''); ?> |
Taxamount ?> |
TotalValue ?> |
+ Quantity ?> |
+ ReceivedQuantity ?> |
+ Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> |
-
+
@@ -1394,13 +1481,21 @@ $(document).ready(function () {
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
ServiceTax;
- $TotalEducessTax = $TotalEducessTax + $record->EducessTax;
- $TotalSecHigherEducessTax = $TotalSecHigherEducessTax + $record->SecHigherEducessTax;
- $TotalKrishiKalyantax = $TotalKrishiKalyantax + $record->KrishiKalyantax;
- $TotalSwachhBharattax = $TotalSwachhBharattax + $record->SwachhBharattax;
+ $TotalCgst = $TotalCgst + $record->After_CGST;
+ $TotalSgst = $TotalSgst + $record->After_SGST;
+ $TotalIgst = $TotalIgst + $record->After_IGST;
+ $OtherAmt = $OtherAmt + $record->otherallowance;
$TotalSummary = $TotalSummary + $record->TotalValue;
@@ -1436,69 +1530,71 @@ $(document).ready(function () {
-
-
- 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount,2)),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
+
+
+
+ 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
'txtTotalServiceTax','value' => set_value('txtTotalServiceTax',$TotalServiceTax),'id'=>'txtTotalServiceTax', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
- 'txtTotalEducess','value' => set_value('txtTotalEducess',$TotalEducessTax),'id'=>'txtTotalEducess', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
- 'txtTotHigherEdu','value' => set_value('txtTotHigherEdu',$TotalSecHigherEducessTax),'id'=>'txtTotHigherEdu', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
+ $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($OtherAmt, 2, '.', '')),'id'=>'ToatalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
'txtTotalKrishiKalyan','value' => set_value('txtTotalKrishiKalyan',$TotalKrishiKalyantax),'id'=>'txtTotalKrishiKalyan', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
- 'txtTotSwachhBharat','value' => set_value('txtTotSwachhBharat',$TotalSwachhBharattax),'id'=>'txtTotSwachhBharat', 'class' => 'form-control num' ,'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
-
-
-
- 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$TotalSummary),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
+ $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
+
+
+
+ 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
+ echo form_textarea($data);
+ ?>
+
+
@@ -1517,7 +1613,7 @@ $(document).ready(function () {
-
+
Request On
'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
-
+
@@ -1557,7 +1653,7 @@ $(document).ready(function () {
| <%=index%> |
<%=ReqNo%> |
-
+ <%=MaterialCode%> |
<%=MaterialName%> |
<%=Quantity%> |
<%=UOM%> |
@@ -1565,6 +1661,9 @@ $(document).ready(function () {
<%=BasicAmount%> |
<%=Taxvalue%> |
<%=TotalValue%> |
+<%=ActualQuantity%> |
+<%=ReceivedQuantity%> |
+<%=PendingQuantity%> |
@@ -1584,18 +1683,10 @@ var userid = '';
};
-var paymentday=;
-if (paymentday=="After")
-{
-//alert();
- document.getElementById("After").checked = true;
-}
-else
-{
- document.getElementById("Before").checked = true;
-}
+
$("#EDITSERVICE").on("shown.bs.modal", function(e) {
+
userid = $(e.relatedTarget).data('userid');
var tr= document.getElementById(userid);
@@ -1612,16 +1703,25 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditQuantity').val($('#quantity'+userid).val());
RequistQuantity = $('#quantity'+userid).val();
$('#EditRate').val($('#itemRate'+userid).val());
- $('#txtEditBasicValue').val(cellval[6].innerHTML);
- $('#EditAfterServiceTax').val($('#ServiceTax'+userid).val());
- $('#EditAfterEduCess').val($('#EduCess'+userid).val());
- $('#EditAfterSecHighTax').val($('#SecHighTax'+userid).val());
- $('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
- $('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
- $('#EditFrequency').val($('#ServiceFrequency'+userid).val());
+ $('#txtEditBasicValue').val(cellval[7].innerHTML);
+ $('#EditCgst').val($('#Cgst'+userid).val());
+ $('#EditSgst').val($('#Sgst'+userid).val());
+ $('#EditIgst').val($('#Igst'+userid).val());
+ $('#EditAfterCgst').val($('#AfterCgst'+userid).val());
+ $('#EditAfterSgst').val($('#AfterSgst'+userid).val());
+ $('#EditAfterIgst').val($('#AfterIgst'+userid).val());
+ if($('#FrequencyValue'+userid).val()==1){
+ $('#EditFrequency').val($('#Frequency'+userid).val());
+ $("#EditFrequencyNo").val(1);
+ }
+ else{
+ $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
+ $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
+ }
- $('#EditTotalOrderValue').val(cellval[8].innerHTML);
-
+ $('#EditTotalOrderValue').val(cellval[9].innerHTML);
+ $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
+ $('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
RequistQuantity = $('#quantity'+userid).val();
@@ -1690,23 +1790,20 @@ $('.AddService').click(function(){
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
var quantity = $("#Quantity").val();
- var itemRate = $("#Rate").val();
+ var itemRate = parseFloat($("#Rate").val()).toFixed(2);
- var AfterServiceTax = $("#AfterServiceTax").val();
-
-
- var AfterEduCess = $("#AfterEduCess").val();
-
-
- var AfterSecHighTax = $("#AfterSecHighTax").val();
-
+ var Cgst = $("#Cgst").val();
+ var AfterCgst = $("#AfterCgst").val();
+ var Sgst = $("#Sgst").val();
+ var AfterSgst = $("#AfterSgst").val();
+ var Igst = $("#Igst").val();
+ var AfterIgst = $("#AfterIgst").val();
+ var FrequencyValue = $("#FrequencyNo").val();
- var AfterKrishiTax = $("#AfterKrishiTax").val();
-
-
- var AfterSwachhTax = $("#AfterSwachhTax").val();
-
+ var Frequency=$("#Frequency").val();
+ var ServiceDescription = $('#txtSpcialInstruction').val();
+ var OtherAmt = $('#OtherAllowances').val();
var TotalOrderValue = $("#TotalOrderValue ").val();
@@ -1732,7 +1829,7 @@ $('.AddService').click(function(){
var template = jQuery("#ServiceList").html();
- $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
+ $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:ServiceDescription,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
@@ -1747,13 +1844,16 @@ $('.AddService').click(function(){
addHidden(theForm,"uom"+temp,uom);
addHidden(theForm,"quantity"+temp,quantity);
addHidden(theForm,"itemRate"+temp,itemRate);
-
- addHidden(theForm,"ServiceTax"+temp,AfterServiceTax);
- addHidden(theForm,"EduCess"+temp,AfterEduCess);
- addHidden(theForm,"SecHighTax"+temp,AfterSecHighTax);
- addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax);
- addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax);
-
+ addHidden(theForm,"Cgst"+temp,Cgst);
+ addHidden(theForm,"AfterCgst"+temp,AfterCgst);
+ addHidden(theForm,"Sgst"+temp,Sgst);
+ addHidden(theForm,"AfterSgst"+temp,AfterSgst);
+ addHidden(theForm,"Igst"+temp,Igst);
+ addHidden(theForm,"AfterIgst"+temp,AfterIgst);
+ addHidden(theForm,"Frequency"+temp,Frequency);
+ addHidden(theForm,"FrequencyValue"+temp,FrequencyValue);
+ addHidden(theForm,"ItemDescription"+temp,ServiceDescription);
+ addHidden(theForm,"OtherAmt"+temp,OtherAmt);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
$('#txtRowCount').val(temp);
@@ -1777,21 +1877,18 @@ $('.AddService').click(function(){
var itemRate = $("#EditRate").val();
+
+ var Cgst = $("#EditCgst").val();
+ var AfterCgst = $("#EditAfterCgst").val();
+ var Sgst = $("#EditSgst").val();
+ var AfterSgst = $("#EditAfterSgst").val();
+ var Igst = $("#EditIgst").val();
+ var AfterIgst = $("#EditAfterIgst").val();
- var AfterServiceTax = $("#EditAfterServiceTax").val();
-
-
- var AfterEduCess = $("#EditAfterEduCess").val();
-
-
- var AfterSecHighTax = $("#EditAfterSecHighTax").val();
-
-
- var AfterKrishiTax = $("#EditAfterKrishiTax").val();
-
-
- var AfterSwachhTax = $("#EditAfterSwachhTax").val();
-
+ var Frequency=$("#EditFrequency").val();
+ var FrequencyValue=$("#EditFrequencyNo").val();
+ var ServiceDescription = $('#EdittxtSpcialInstruction').val();
+ var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
@@ -1804,13 +1901,14 @@ $('.AddService').click(function(){
var tr= document.getElementById(userid);
var cellval = tr.cells;
- cellval[2].innerHTML = editDescription;
- cellval[3].innerHTML = editQuantity;
- cellval[4].innerHTML =editUOM;
- cellval[5].innerHTML =itemRate;
- cellval[6].innerHTML =basicval;
- cellval[7].innerHTML =TotalTaxValue;
- cellval[8].innerHTML =TotalOrderValue;
+ cellval[2].innerHTML = editMaterialCode;
+ cellval[3].innerHTML = ServiceDescription;
+ cellval[4].innerHTML = editQuantity;
+ cellval[5].innerHTML =editUOM;
+ cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
+ cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
+ cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
+ cellval[9].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode'+userid).val(editMaterialCode);
@@ -1818,13 +1916,16 @@ $('.AddService').click(function(){
$('#uom'+userid).val(editUOM);
$('#CostCode'+userid).val(CostCode);
$('#quantity'+userid).val(editQuantity);
- $('#itemRate'+userid).val(itemRate);
- $('#ServiceTax'+userid).val(AfterServiceTax);
- $('#EduCess'+userid).val(AfterEduCess);
- $('#SecHighTax'+userid).val(AfterSecHighTax);
- $('#KrishiTax'+userid).val(AfterKrishiTax);
- $('#SwachhTax'+userid).val(AfterSwachhTax);
- $('#TotalOrderValue'+userid).val(TotalOrderValue);
+ $('#itemRate'+userid).val(itemRate);
+ $('#Cgst'+userid).val(Cgst);
+ $('#AfterCgst'+userid).val(AfterCgst);
+ $('#Sgst'+userid).val(Sgst);
+ $('#AfterSgst'+userid).val(AfterSgst);
+ $('#Igst'+userid).val(Igst);
+ $('#AfterIgst'+userid).val(AfterIgst);
+ $('#TotalOrderValue'+userid).val(TotalOrderValue);
+ $('#ItemDescription'+userid).val(ServiceDescription);
+ $('#OtherAmt'+userid).val(OtherAmt);
populateValueMainFormForEditServiceTax();
}
@@ -1841,11 +1942,10 @@ $('.AddService').click(function(){
function populateValueMainFormForServiceTax()
{
- var AfterServiceTax = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
- var AfterEduCess = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
- var AfterSecHighTax = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
- var AfterKrishiTax = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
- var AfterSwachhTax = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
+ var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
+ var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
+ var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
+ var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
var TotalVal = $('#TotalOrderValue ').val() == '' ? '0.00' : $('#TotalOrderValue').val();
var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
@@ -1854,21 +1954,15 @@ function populateValueMainFormForServiceTax()
var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
- totBasicAmt = Number(totBasicAmt.replace(/[^0-9\.]+/g,""));
-
- var TotalServiceTax = $('#txtTotalServiceTax').val() == '' ? '0.00' : $('#txtTotalServiceTax').val();
- var TotHigherEdu = $('#txtTotHigherEdu').val() == '' ? '0.00' : $('#txtTotHigherEdu').val();
- var TotalEducess = $('#txtTotalEducess').val() == '' ? '0.00' : $('#txtTotalEducess').val();
- var TotalKrishiKalyan = $('#txtTotalKrishiKalyan').val() == '' ? '0.00' : $('#txtTotalKrishiKalyan').val();
- var TotSwachhBharat = $('#txtTotSwachhBharat').val() == '' ? '0.00' : $('#txtTotSwachhBharat').val();
-
-
+ var TotalCgst = $('#txtTotCgst').val() == '' ? '0.00' : $('#txtTotCgst').val();
+ var TotSgst = $('#txtTotSgst').val() == '' ? '0.00' : $('#txtTotSgst').val();
+ var TotalIgst = $('#txtTotIgst').val() == '' ? '0.00' : $('#txtTotIgst').val();
+ var TotalAllowance = $('#ToatalOtherAllowances').val() == '' ? '0.00' : $('#ToatalOtherAllowances').val();
$('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
- $('#txtTotalServiceTax').val((parseFloat(TotalServiceTax) + parseFloat(AfterServiceTax)).toFixed(2) );
- $('#txtTotHigherEdu').val((parseFloat(TotHigherEdu) + parseFloat(AfterSecHighTax)).toFixed(2) );
- $('#txtTotalEducess').val((parseFloat(TotalEducess) + parseFloat(AfterEduCess)).toFixed(2) );
- $('#txtTotalKrishiKalyan').val((parseFloat(TotalKrishiKalyan) + parseFloat(AfterKrishiTax)).toFixed(2) );
- $('#txtTotSwachhBharat').val((parseFloat(TotSwachhBharat) + parseFloat(AfterSwachhTax)).toFixed(2) );
+ $('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
+ $('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
+ $('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
+ $('#ToatalOtherAllowances').val((parseFloat(TotalAllowance) + parseFloat(OtherAmt)).toFixed(2) );
$('#txtTotalOrderValueSummary').val((parseFloat(TotalOrderValueSummary) + parseFloat(TotalVal)).toFixed(2) );
}
@@ -1876,16 +1970,15 @@ function populateValueMainFormForEditServiceTax()
{
var rows = document.getElementById('ServiceTable').rows.length;
-
- var TotServiceTax = 0;
- var TotEduCess = 0;
- var TotSecHighTax = 0;
- var TotKrishiTax = 0;
- var TotSwachhTax = 0;
+
+ var TotCgst = 0;
+ var TotSgst = 0;
+ var TotIgst = 0;
+ var TotOther = 0;
var TotSummary = 0;
var TotBasicAmout = 0;
- var i = 0;
- do {
+ var i = 0;
+ do {
i += 1;
var tr= document.getElementById(i);
//alert(tr);
@@ -1896,49 +1989,47 @@ function populateValueMainFormForEditServiceTax()
var rowid = cells[0].innerHTML;
- var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
- var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
- var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
- var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
- var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+ var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
+ var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
+ var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
+ var OtherAmt = $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
- var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
- var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
+ var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
+ var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();
+ var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) * parseFloat(FrequencyValue);
- TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
- TotEduCess = parseFloat(TotEduCess) + parseFloat(AfterEduCess);
- TotSecHighTax = parseFloat(TotSecHighTax) + parseFloat(AfterSecHighTax);
- TotKrishiTax = parseFloat(TotKrishiTax) + parseFloat(AfterKrishiTax);
- TotSwachhTax = parseFloat(TotSwachhTax) + parseFloat(AfterSwachhTax);
+ TotCgst = parseFloat(TotCgst) + parseFloat(AfterCgst);
+ TotSgst = parseFloat(TotSgst) + parseFloat(AfterSgst);
+ TotIgst = parseFloat(TotIgst) + parseFloat(AfterIgst);
+ TotOther = parseFloat(TotOther) + parseFloat(OtherAmt);
TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
}
- } while (i < rows);
+ } while (i < rows);
$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
- $('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
- $('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
- $('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
- $('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
- $('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
+ $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+ $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+ $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+ $('#ToatalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );
}
+
function calculateEditTaxValue()
{
- var ServiceTaxAmount = parseFloat($('#EditAfterServiceTax').val());
- var EduCessTaxAmount = parseFloat($('#EditAfterEduCess').val());
- var SecHighTaxAmount = parseFloat($('#EditAfterSecHighTax').val());
- var KrishiTaxAmount = parseFloat($('#EditAfterKrishiTax').val());
- var SwachhTaxAmount = parseFloat($('#EditAfterSwachhTax').val());
-
- var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
- return parseFloat(TottaxAmt.toFixed(2));
+ var Cgst = parseFloat($('#EditAfterCgst').val());
+ var Sgst = parseFloat($('#EditAfterSgst').val());
+ var Igst = parseFloat($('#EditAfterIgst').val());
+
+
+ var TottaxAmt = Cgst + Sgst + Igst;
+ return parseFloat(TottaxAmt).toFixed(2);
}
function clearServiceModalFields()
{
@@ -1954,17 +2045,22 @@ function clearServiceModalFields()
$("#Rate").val('');
$("#txtBasicValue").val('');
- $("#AfterServiceTax").val('');
- $("#AfterEduCess").val('');
- $("#AfterSecHighTax").val('');
- $("#AfterKrishiTax").val('');
- $("#AfterSwachhTax").val('');
+ $("#AfterCgst").val(0);
+ $("#AfterSgst").val(0);
+ $("#AfterIgst").val(0);
+ $("#Cgst").val(0);
+ $("#Sgst").val(0);
+ $("#Igst").val(0);
+ $("#OtherAllowances").val(0);
+ $("#txtSpcialInstruction").val('');
$("#TotalOrderValue ").val('');
+ $("#Frequency").val('');
}
var DeletedMaterialCode='';
var DeletedMaterialName='';
function DeleteRow(rowid)
{
+
var id = [];
var DelRows = $('#txtDeletedRow').val();
@@ -1978,11 +2074,12 @@ function DeleteRow(rowid)
id[1]= ReqNo;
id[2]= MaterialCode;
id[3]= POType;
-
+
+
var answer = confirm(" Do you want to delete the Item from the List?")
if (answer)
{
-
+ populateValueMainFormForDeleteItem(rowid);
tr.parentNode.removeChild(tr);
var removeItem = $('#materialCode'+rowid).val();
@@ -2070,7 +2167,7 @@ function DeleteRow(rowid)
}});
}
- populateValueMainFormForDeleteItem(rowid);
+ // populateValueMainFormForDeleteItem(rowid);
}
@@ -2079,48 +2176,41 @@ function populateValueMainFormForDeleteItem(rowid)
{
- //alert(rowid);
- var TotServiceTax = $('#txtTotalServiceTax').val();
- var TotEduCess = $('#txtTotalEducess').val();
- var TotSecHighTax = $('#txtTotHigherEdu').val();
- var TotKrishiTax = $('#txtTotalKrishiKalyan').val();
- var TotSwachhTax = $('#txtTotSwachhBharat').val();
- var TotSummary = $('#TotalOrderValue').val();
+ // alert(rows);
+ var TotCgst = $('#txtTotCgst').val();
+ var TotSgst = $('#txtTotSgst').val();
+ var TotIgst = $('#txtTotIgst').val();
+ var TotOtherAmt = $('#ToatalOtherAllowances').val();
+ var TotSummary = $('#txtTotalOrderValueSummary').val();
var TotBasicAmout = $('#txtTotBasicAmount').val();
-
+
- var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
- var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
- var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
- var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
- var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
+ var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
+ var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
+ var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
+ var OtherAmt = $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
- var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
- // alert(BasicVal);
+ var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();
+ var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) * parseFloat(FrequencyValue);
//alert(TotalVal);
-
- TotServiceTax = parseFloat(TotServiceTax) - parseFloat(AfterServiceTax);
- TotEduCess = parseFloat(TotEduCess) - parseFloat(AfterEduCess);
- TotSecHighTax = parseFloat(TotSecHighTax) - parseFloat(AfterSecHighTax);
- TotKrishiTax = parseFloat(TotKrishiTax) - parseFloat(AfterKrishiTax);
- TotSwachhTax = parseFloat(TotSwachhTax) - parseFloat(AfterSwachhTax);
-
- TotSummary = parseFloat(TotBasicAmout) - parseFloat(TotalVal);
+ TotCgst = parseFloat(TotCgst) - parseFloat(AfterCgst);
+ TotSgst = parseFloat(TotSgst) - parseFloat(AfterSgst);
+ TotIgst = parseFloat(TotIgst) - parseFloat(AfterIgst);
+ TotOtherAmt = parseFloat(TotOtherAmt) - parseFloat(OtherAmt);
+ TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
-
$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
- $('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
- $('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
- $('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
- $('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
- $('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
+ $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+ $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+ $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+ $('#ToatalOtherAllowances').val(parseFloat(TotOtherAmt).toFixed(2) );
$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );
@@ -2297,16 +2387,48 @@ $('#Scheduleby').change(function(){
-var Detail = ;
-//console.log(Detail);
-
- $.each(Detail, function (index, value)
- {
- $("#PaymentTerms").append( $('').val(value.ConfigValue).html(value.ConfigValue) );
+function calculateCgstTax(varBasicValue,Cgst)
+ {
+
+ var basicValue = parseFloat(varBasicValue);
+ var Cgst = parseFloat(Cgst);
+ var ServiceTaxValue = 0.0;
+
+ ServiceTaxValue = ;
+
+ var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
+
+ return TAXval;// $('#AfterServiceTax').val(TAXval);
+
+ }
+function calculateSgstTax(varBasicValue,Sgst)
+ {
+
+ var basicValue = parseFloat(varBasicValue);
+ var Sgst = parseFloat(Sgst);
+ var ServiceTaxValue = 0.0;
+
+ ServiceTaxValue = ;
+
+ var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
+
+ return TAXval;// $('#AfterServiceTax').val(TAXval);
+
+ }
+function calculateIgstTax(varBasicValue,Igst)
+ {
+
+ var basicValue = parseFloat(varBasicValue);
+ var Igst = parseFloat(Igst);
+ var ServiceTaxValue = 0.0;
+
+ ServiceTaxValue = ;
+
+ var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
+
+ return TAXval;// $('#AfterServiceTax').val(TAXval);
+
+ }
-
- } );
-
-
-
+
\ No newline at end of file
diff --git a/application/views/EditservicePurchaseorder.php~ b/application/views/EditservicePurchaseorder.php~
new file mode 100755
index 00000000..5bd1a7bf
--- /dev/null
+++ b/application/views/EditservicePurchaseorder.php~
@@ -0,0 +1,2434 @@
+FontCode2000;
+
+ }
+}
+
+if(!empty($MaxPODate))
+{
+ foreach ($MaxPODate as $date)
+ {
+ $MaxPoDate = $date->PODate;
+
+ }
+}
+if(!empty($POMaster))
+{
+ foreach ($POMaster as $Req)
+ {
+
+ $SupId = $Req->SupplierID;
+ $SupName = $Req->SupplierName;
+ $Address = $Req->Address;
+ $pdt = new DateTime($Req->PODate);
+ $PODate = $pdt->format('Y-m-d');
+ $DeliverOption = $Req->DeliveryOption;
+ $DeliverSchedule = $Req->DeliverySchedule;
+ $Ddt = new DateTime($Req->DeliveryDate);
+ $Deliverydt = $Ddt->format('Y-m-d');
+
+ $DeliveryAddress =$Req->DeliveryAddress;
+ $PONOStatus = $Req->StatusCode;
+ $PONO = $Req->PONO;
+ $ServiceDescription = $Req->ServiceDescription;
+ //Terms=$Req->PaymentTerms;
+
+ $WrkStatus=$Req->ServiceWorkStatus;
+ $StatusName=$Req->StatusName;
+ }
+}
+
+
+if(!empty($RequistionDetails))
+{
+
+ foreach ($RequistionDetails as $ReqDet)
+ {
+ // $Reqon=$ReqDet->ReqDate;
+ $Reqonn=new DateTime($ReqDet->ReqDate);
+ $Reqon=$Reqonn->format('Y-m-d');
+ $Requestedby=$ReqDet->Requestedby;
+ $RequesterName=$ReqDet->FirstName;
+ //$Status=$ReqDet->Status;
+ }
+}
+
+//echo "$WrkStatus";
+
+if(!empty($AvlBudAmt))
+{
+
+ $AvlAmount = number_format($AvlBudAmt, 2, '.', '');
+
+}
+
+
+foreach ($PaymentTerms as $TER)
+{
+ $Terms=$TER->PaymentTerms;
+}
+
+
+
+// foreach ($POSTATUS as $PST )
+// {
+// $POStatus=$PST->StatusName;
+// }
+?>
+
+
+
+
+
+
+
+ 'form-label-left ServicePO ','name' => 'ServicePO','id' => 'ServicePO');
+
+ echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
+
+
+
+
+ Siddharth Industries - Edit Service Purchase Order -
+
+
+
+
+
+
+
+
+ 'Selected Requisition Numbers');
+ if(!empty($ReqList))
+ {
+ foreach ($ReqList as $SID):
+
+ $options[$SID->ReqNo] = $SID->ReqNo ;
+ endforeach;
+ }
+ echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
+
+ ?>
+
+
+
+
+ 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Select Supplier');
+ //print_r( $options);
+
+ if(!empty($Suplist))
+ {
+ foreach ($Suplist as $SID):
+
+
+ $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+ 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'POType','value' => set_value('POType',SERVICE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+ Select Delivery By
+
+ |
+ 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
+ |
+
+
+ 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
+
+ |
+
+
+
+
+ StatusCode){
+ $optionsWork[$WorkSID->StatusCode] = $WorkSID->StatusName;
+ }
+
+
+ endforeach;
+ foreach ($WorkStatus as $SID):
+ if($WrkStatus!=$SID->StatusCode){
+ $optionsWork[$SID->StatusCode] = $SID->StatusName;
+ }
+
+
+ endforeach;
+ }
+
+ echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+ 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ PaymentID){
+
+ $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms;
+
+ }
+ endforeach;
+ foreach ($Payment as $pay1):
+
+ if($Terms!=$pay1->PaymentID){
+
+ $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms;
+
+ }
+ endforeach;
+ }
+
+ echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | SNo |
+ Requisition No |
+ Item Code |
+ Item Description |
+ Quantity |
+ UOM |
+ Rate |
+ Basic Amount |
+ Tax Amount |
+ Total Order Amount |
+ Actual Quantity |
+ Received Quantity |
+ Pending Quantity |
+ Action |
+
+
+
+
+ Schedule_Type!='Recurring'){
+ $FrequencyNo=intval(1);
+ $Frequency='One Time';
+ }
+ else{
+ $FrequencyNo=$record->NumberOfService;
+ $Frequency=$record->Service_Period;
+ }
+
+ ?>
+
+ |
+ ReqNo ?> |
+ MaterialCode ?> |
+ ServiceMaterialDescription ?> |
+ Quantity ?> |
+ UOM ?> |
+
+ Rate ?> |
+
+ BasicValue * $FrequencyNo, 2, '.', ''); ?> |
+
+ Taxamount ?> |
+ TotalValue ?> |
+ Quantity ?> |
+ ReceivedQuantity ?> |
+ Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | |
+
+
+ After_CGST;
+ $TotalSgst = $TotalSgst + $record->After_SGST;
+ $TotalIgst = $TotalIgst + $record->After_IGST;
+ $OtherAmt = $OtherAmt + $record->otherallowance;
+ $TotalSummary = $TotalSummary + $record->TotalValue;
+
+
+ $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
+
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($OtherAmt, 2, '.', '')),'id'=>'ToatalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
+ echo form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+ Request On
+ 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+ Request By
+ 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+ Status
+ 'Select Status');
+ // echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2')
+ // $options = array("0"=>$PONOStatus);
+ // echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"' ,'required="true"' ,'class="form-control select2')
+
+
+ $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 76796d5c..7f743988 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -55,13 +55,15 @@ if(!empty($INRSYMBOL))
{
text-align:left;
}
-
+ .nopad {
+ padding:0px;
+ }
-
+
\ No newline at end of file
diff --git a/application/views/alterpurchaseorder.php~ b/application/views/alterpurchaseorder.php~
new file mode 100755
index 00000000..7f743988
--- /dev/null
+++ b/application/views/alterpurchaseorder.php~
@@ -0,0 +1,6915 @@
+
+format('Y-m-d');
+$MaxPoDate = '';
+if(!empty($MaxPODate))
+{
+ foreach ($MaxPODate as $date)
+ {
+ $MaxPoDate = $date->PODate;
+ }
+}
+if(!empty($CompanyDetails))
+{
+ foreach ($CompanyDetails as $Req)
+ {
+ $CompanyAddress = $Req->Address;
+ }
+}
+
+if(!empty($INRSYMBOL))
+{
+
+ foreach($INRSYMBOL as $INRS)
+ {
+ $INRSYM=$INRS->FontCode2000;
+
+ }
+}
+?>
+
+
+
+
+
+
+ 'form-label-left CreatealterPO ','name' => 'CreatealterPO','id' => 'CreatealterPO');
+
+ echo form_open($this->config->base_url().'/purchaseorder/addalterPO/',$attributes); ?>
+
+
+
+
+ Siddharth Industries - Emergency Purchase Order
+
+
+
+
+
+
+
+ 'Select Request Type');
+
+ if(!empty($RequestType))
+ {
+
+ foreach ($RequestType as $RID):
+ if($RID->ConfigValue=="SERVICE" || $RID->ConfigValue=="REVENUE")
+ {
+ $options[$RID->ConfigValue] = $RID->ConfigValue;
+ }
+ endforeach;
+ }
+
+ echo form_dropdown('RequestType', $options,set_value('ConfigValue'),'id="purpose"' ,'class = "form-control select2"','required="true"');
+
+ ?>
+
+
+
+
+
+ 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'POType','value' => set_value('POType',$ReqType),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ Select Delivery By
+
+ |
+ "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?> |
+
+ "DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
+
+ |
+
+
+
+
+
+
+ 'Selected Work Status');
+ foreach ($WorkStatus as $WSID):
+
+
+ $options4[$WSID->StatusCode] = $WSID->StatusName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('workstatus', $options4,set_value('workstatus'),'id="workstatusValue"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+
+
+
+
+ 'Select Supplier');
+ //print_r( $options);
+
+ if(!empty($Suplist))
+ {
+ foreach ($Suplist as $SID):
+
+
+ $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2"');
+
+ ?>
+
+
+
+
+
+
+ 'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+ 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Department Name');
+
+ if(!empty($DeptList))
+ {
+
+ foreach ($DeptList as $DID):
+
+ $options1[$DID->DEPCode] = $DID->DEPCode.' '.' - '.' '.$DID->DepartmentName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('drpDepartment', $options1,set_value('drpDepartment'),'id="DepartmentName"' ,'class = "form-control select2"','required="true"', 'disabled="disabled"');
+
+ ?>
+
+
+
+
+
+
+ 'Cost Center Name');
+
+
+ if(!empty($CostList))
+ {
+
+ foreach ($CostList as $cost):
+
+
+ $options2[$cost['CostCenterCode']] = $cost['CostCenterCode'].' '.' - '.' '.$cost['CostCenterName'];
+
+ endforeach;
+ }
+
+ echo form_dropdown('CostCenterName', $options2,set_value('CostCenterName'),'id="CostCenterName"','class="form-control select2"' , 'required="true"' ,'multiple="true"');
+
+ ?>
+
+
+
+ ; ?>assets/dist/img/red.png)
+
+ 'AvalBuget','value' => set_value('AvalBuget'),'id'=>'AvalBuget', 'class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ Select Tax Range
+
+ |
+ "Range", "id"=>"Local", "value"=>"0", 'checked'=>set_radio('Range', '0', TRUE))); ?> |
+
+ "Range", "id"=>"Inter_state", "value"=>"1", 'checked'=>set_radio('Range', '1', FALSE))); ?>
+
+ |
+
+
+
+
+
+
+
+
+
+
+ 'txtcurrencytype','value' => set_value('txtcurrencytype'),'id'=>'txtcurrencytype', 'class' => 'form-control' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtexachangerate','value' => set_value('txtexachangerate'),'id'=>'txtexachangerate', 'class' => 'form-control' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ConfigValue] = $SerOption->ConfigValue;
+ endforeach;
+
+ }
+ echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+
+ 'ServiceNo','value' => set_value('ServiceNo',1),'id'=>'ServiceNo', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ Payable Terms
+ 'Select Payment method');
+ //print_r( $options);
+ if(!empty($Payment))
+ {
+ foreach ($Payment as $payment):
+
+
+ $options1[$payment->PaymentID] = $payment->PaymentTerms;
+
+ endforeach;
+ }
+ echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"');
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | SNo |
+ Requisition No |
+ Item Code |
+ Item Description |
+ Quantity |
+ UOM |
+ Rate |
+ Basic Amount |
+ Tax Amount |
+ Total Order Amount |
+ Action |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'txtTotBasicAmountRevenue','value' => set_value('txtTotBasicAmountRevenue'),'id'=>'txtTotBasicAmountRevenue', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'txtTotalDiscount','value' => set_value('txtTotalDiscount'),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'txtTotalCGST','value' => set_value('txtTotalCGST'),'id'=>'txtTotalCGST', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'txtTotalSGST','value' => set_value('txtTotalSGST'),'id'=>'txtTotalSGST', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotalIGST','value' => set_value('txtTotalIGST'),'id'=>'txtTotalIGST', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'txtTotalPackaing','value' => set_value('txtTotalPackaing'),'id'=>'txtTotalPackaing', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtTotalInsurance','value' => set_value('txtTotalInsurance'),'id'=>'txtTotalInsurance', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+ 'txtTotalFreight','value' => set_value('txtTotalFreight'),'id'=>'txtTotalFreight', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '4', 'cols' => '40' );
+ echo form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Submit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotOtherAllo','value' => set_value('txtTotOtherAllo'),'id'=>'txtTotOtherAllo', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+ 'txtTotalOrderValueSummaryService','value' => set_value('txtTotalOrderValueSummaryService'),'id'=>'txtTotalOrderValueSummaryService', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control num' ,'rows' => '4', 'cols' => '40' );
+ echo form_textarea($data); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 4a7e2ab9..0a482937 100755
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -1,35 +1,73 @@
ReqNo;
- $ReqType = $Req->ReqType;
- $Requestedby = $Req->Requestedby;
- $FirstName =$Req->FirstName;
+ $ReqType = $Req->ReqType;
+ $Requestedby = $Req->Requestedby;
+ $FirstName =$Req->FirstName;
$Designation =$Req->Designation;
$DepartmentName = $Req->DepartmentName;
$Status = $Req->Status;
- $CostCenterCode = $Req->CostCenterCode;
+ $CostCenterCode = $Req->CostCenterCode;
+ $serviceSchedule=$Req->Schedule_Type;
+
+ $servicePeriod=$Req->Service_Period;
+ $noOfService=$Req->NumberOfService;
+
}
}
?>
-
+
+
@@ -129,6 +167,74 @@ if(!empty($ReqDetails))
+
+
+
+
+
+
+
+
+
+ ConfigValue){
+
+ $ServiceOptions[$SerOptionsel->ConfigValue] = $SerOptionsel->ConfigValue;
+ }
+ endforeach;
+
+ foreach ($ServiceOption as $SerOption):
+ if($servicePeriod!=$SerOption->ConfigValue){
+ $ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
+ }
+ endforeach;
+
+ }
+ echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+
+ 'ServiceNo','value' => set_value('ServiceNo',$noOfService),'id'=>'ServiceNo', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+ echo form_input($data);
+ ?>
+
+
@@ -416,7 +522,7 @@ $(function() {
if(data)
{
$('#content').loader('hide');
- $("#AvlBudgetAmount").val(data);
+ $("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
{
@@ -453,7 +559,7 @@ $('#CostCenter').change(function() {
if(data)
{
$('#content').loader('hide');
- $("#AvlBudgetAmount").val(number_format(data,2));
+ $("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
{
@@ -620,8 +726,30 @@ else
//alert(document.getElementById('Items').rows.length);
$('#content').loader('show');
$('#txtStatus').val(stat);
+
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ if($('#RequestType').val()=='SERVICE'){
+ if($('#ScheduleType').val()=='Recurring'){
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod=$('#ServiceOptions').val();
+ noOfService=$('#ServiceNo').val();
+ }
+ else{
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod='';
+ noOfService=0;
+ }
+
+ }
+ else{
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ }
$.ajax({
- data:$('.requistion').serialize(),
+ data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
type:"POST",
url:"requisitionform/EditRequistion",
success:function(data) {
@@ -902,4 +1030,18 @@ $('.EditClick').click(function(){
});
});
+$("#ScheduleType").change(function(){
+if($('#ScheduleType').val().trim()!='Recurring'){
+document.getElementById('ServicePeriodOption').style.display = 'none';
+document.getElementById('NoServices').style.display = 'none';
+
+
+}
+else{
+document.getElementById('ServicePeriodOption').style.display = 'block';
+document.getElementById('NoServices').style.display = 'block';
+
+}
+
+});
diff --git a/application/views/editrequisitionform.php~ b/application/views/editrequisitionform.php~
new file mode 100755
index 00000000..0a482937
--- /dev/null
+++ b/application/views/editrequisitionform.php~
@@ -0,0 +1,1047 @@
+
+ReqNo;
+ $ReqType = $Req->ReqType;
+ $Requestedby = $Req->Requestedby;
+ $FirstName =$Req->FirstName;
+ $Designation =$Req->Designation;
+ $DepartmentName = $Req->DepartmentName;
+ $Status = $Req->Status;
+ $CostCenterCode = $Req->CostCenterCode;
+ $serviceSchedule=$Req->Schedule_Type;
+
+ $servicePeriod=$Req->Service_Period;
+ $noOfService=$Req->NumberOfService;
+
+ }
+}
+
+
+?>
+
+
+
+
+
+
+
+
+ Siddharth Industries - Edit Requisition Form
+
+
+
+ 'form-label-left requistion ','name' => 'requistion','id' => 'requistion');
+
+ echo form_open($this->config->base_url().'requisitionform/EditRequistion',$attributes); ?>
+
+
+
+
+
+
+
+ 'RequestType','value' => set_value('RequestType',$ReqType),'id'=>'RequestType', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+
+ ?>
+
+
+
+
+
+
+
+
+ 'EmpID','value' => set_value('EmpID',$FirstName),'id'=>'EmpID', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+
+ ?>
+
+
+
+
+
+
+ 'DeptName','value' => set_value('DeptName',$DepartmentName),'id'=>'DeptName', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Designation','value' => set_value('Designation',$Designation),'id'=>'Designation', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ $CostCenterCode);
+ //print_r( $options);
+
+ if(!empty($CostCenter))
+ {
+ foreach ($CostCenter as $SID):
+ // echo $SID->ConfigValue;
+ $Costs[$SID->CostCenterCode] = $SID->CostCenterCode .'-'. $SID->CostCenterName ;
+
+ endforeach;
+
+ }
+ echo form_dropdown('CostCenter', $Costs,set_value('CostCenter'),'id="CostCenter"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+ ; ?>assets/dist/img/red.png)
+
+ 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ConfigValue){
+
+ $ServiceOptions[$SerOptionsel->ConfigValue] = $SerOptionsel->ConfigValue;
+ }
+ endforeach;
+
+ foreach ($ServiceOption as $SerOption):
+ if($servicePeriod!=$SerOption->ConfigValue){
+ $ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
+ }
+ endforeach;
+
+ }
+ echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+
+ 'ServiceNo','value' => set_value('ServiceNo',$noOfService),'id'=>'ServiceNo', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Line Item
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Material Code');
+ //print_r( $options);
+
+ if(!empty($MaterialCode))
+ {
+ foreach ($MaterialCode as $MID):
+
+
+ $options[$MID->MaterialCode] = $MID->MaterialCode.' '.' - '.' '.$MID->MaterialName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('drpMaterial', $options,set_value('drpMaterial'),'id="drpMaterial"' ,'class="form-control"');
+
+ ?>
+
+
+
+
+
+
+ 'Description','value' => set_value('Description'),'id'=>'Description', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'UOM','value' => set_value('UOM'),'id'=>'UOM', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'EditMaterialCode', 'value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditDescription','value' => set_value('EditDescription'),'id'=>'EditDescription', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | SNo |
+ Material Code |
+ Material Name |
+ Uom |
+
+RequestedQuantity |
+ PoQuantity |
+ Status |
+ Action |
+
+
+
+
+
+ |
+
+
+
+ MaterialCode ; ?> |
+ MaterialName ; ?> |
+
+ UOM ; ?> |
+
+ Quantity ; ?> |
+ POQTY ; ?> |
+ StatusName ;?> |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index 94e45eb2..7964887f 100755
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -16,9 +16,7 @@ if(!empty($Emp))
}
}
?>
-
+
@@ -121,9 +119,66 @@ if(!empty($Emp))
?>
+
+
+
+
+
+
+
+
+
+ ConfigValue] = $SerOption->ConfigValue;
+ endforeach;
+
+ }
+ echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+
+ 'ServiceNo','value' => set_value('ServiceNo'),'id'=>'ServiceNo', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
-
@@ -296,7 +351,7 @@ if(!empty($Emp))
Save
-
+
@@ -346,7 +401,7 @@ $('#CostCenter').change(function() {
if(data)
{
$('#content').loader('hide');
- $("#AvlBudgetAmount").val(data);
+ $("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
{
$('#AlertImg').removeAttr("style");
@@ -379,10 +434,10 @@ $('#CostCenter').change(function() {
$('#RequestType').change(function()
{
$("#AvlBudgetAmount").val('');
- $('#AlertImg').attr("style","display:none;");
+ $('#AlertImg').attr("style","display:none;");
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
- $("#Description").val('');
+ $("#Description").val('');
$("#UOM").val('');
$('#CostCenter').val("-1");
@@ -405,7 +460,19 @@ $('#CostCenter').change(function() {
$("#MaterialCode").empty();
$("#MaterialCode").append(json.Material);
// $("#Description").val(json.MaterialName);
- //$("#UOM").val(json.UOM);
+ //$("#UOM").val(json.UOM);
+ if(id!='SERVICE'){
+ $('#DisplayScheduleDiv').hide();
+ $('#ServicePeriodOption').hide();
+ $('#NoServices').hide();
+
+
+ }
+ else{
+ $('#DisplayScheduleDiv').show();
+
+ }
+
}
});
@@ -507,9 +574,30 @@ function Save()
else
{
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ if($('#RequestType').val()=='SERVICE'){
+ if($('#ScheduleType').val()=='Recurring'){
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod=$('#ServiceOptions').val();
+ noOfService=$('#ServiceNo').val();
+ }
+ else{
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod='';
+ noOfService=0;
+ }
+
+ }
+ else{
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ }
$('#content').loader('show');
$.ajax({
- data:$('.requistion').serialize(),
+ data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
type:"POST",
url:"requisitionform/addNewRequistion?ID="+id,
success:function(data) {
@@ -733,9 +821,30 @@ $('.EditClick').click(function(){
}
else
{
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ if($('#RequestType').val()=='SERVICE'){
+ if($('#ScheduleType').val()=='Recurring'){
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod=$('#ServiceOptions').val();
+ noOfService=$('#ServiceNo').val();
+ }
+ else{
+ serviceSchedule=$('#ScheduleType').val();
+ servicePeriod='';
+ noOfService=0;
+ }
+
+ }
+ else{
+ var serviceSchedule='';
+ var servicePeriod='';
+ var noOfService='';
+ }
$('#content').loader('show');
$.ajax({
- data:$('.requistion').serialize(),
+ data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
type:"POST",
url:"requisitionform/addNewRequistion?ID="+id,
success:function(data) {
@@ -774,4 +883,19 @@ $('.EditClick').click(function(){
});
});
+
+$("#ScheduleType").change(function(){
+if($('#ScheduleType').val().trim()!='Recurring'){
+document.getElementById('ServicePeriodOption').style.display = 'none';
+document.getElementById('NoServices').style.display = 'none';
+
+ $('#ServiceNo').val('');
+}
+else{
+document.getElementById('ServicePeriodOption').style.display = 'block';
+document.getElementById('NoServices').style.display = 'block';
+document.getElementById('ServiceNo').value = 1;
+}
+
+});
diff --git a/application/views/requisitionform.php~ b/application/views/requisitionform.php~
new file mode 100755
index 00000000..7964887f
--- /dev/null
+++ b/application/views/requisitionform.php~
@@ -0,0 +1,901 @@
+
+EmpID ;
+ $FirstName = $Emp->FirstName ;
+ $Designation = $Emp->Designation;
+ $DepartmentName =$Emp->DepartmentName;
+ }
+}
+?>
+
+
+
+
+
+
+
+ Siddharth Industries - Requisition Form
+
+
+ 'form-label-left requistion ','name' => 'requistion','id' => 'requistion');
+
+ echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
+
+
+
+
+
+ 'Select Request Type');
+
+ //print_r( $options);
+
+ if(!empty($RequestType))
+ {
+ foreach ($RequestType as $RID):
+
+
+ $options[$RID->ConfigValue] = $RID->ConfigValue;
+
+ endforeach;
+ }
+
+ echo form_dropdown('RequestType', $options,set_value('ConfigValue'),'id="RequestType"' ,'class = "form-control select2"','required="true"');
+
+ ?>
+
+
+
+
+
+
+
+ 'EmpID','value' => set_value('EmpID',$FirstName),'id'=>'EmpID', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+ />
+
+
+
+
+
+ 'DeptName','value' => set_value('DeptName',$DepartmentName),'id'=>'DeptName', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Designation','value' => set_value('Designation',$Designation),'id'=>'Designation', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Select Cost Center Name');
+ //print_r( $options);
+
+ if(!empty($CostCenter))
+ {
+ foreach ($CostCenter as $SID):
+ // echo $SID->ConfigValue;
+ $Costs[$SID->CostCenterCode] = $SID->CostCenterCode .'-'. $SID->CostCenterName ;
+
+ endforeach;
+
+ }
+ echo form_dropdown('CostCenter', $Costs,set_value('CostCenter'),'id="CostCenter"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+ ; ?>assets/dist/img/red.png)
+
+ 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ ConfigValue] = $SerOption->ConfigValue;
+ endforeach;
+
+ }
+ echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
+
+ ?>
+
+
+
+
+
+ 'ServiceNo','value' => set_value('ServiceNo'),'id'=>'ServiceNo', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Line Item
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Material Code');
+ //print_r( $options);
+
+ if(!empty($MaterialList))
+ {
+ foreach ($MaterialList as $MID):
+
+
+ $options[$MID->MaterialCode] = $MID->MaterialCode.' '.' - '.' '.$MID->MaterialName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
+
+ ?>
+
+
+
+
+
+
+ 'Description','value' => set_value('Description'),'id'=>'Description', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'UOM','value' => set_value('UOM'),'id'=>'UOM', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'EditMaterialCode', 'value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditDescription','value' => set_value('EditDescription'),'id'=>'EditDescription', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM', 'class' => 'form-control','readonly' => 'true' );
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | SNo |
+ Material Code |
+ Material Name |
+ Uom |
+ Quantity |
+ Action |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 67c32d62..489cddd7 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -69,7 +69,7 @@ var AvilBudAmt = '';
-
+document.getElementById("Date").checked = true;
$('#drpSupplier').change(function() {
@@ -80,7 +80,7 @@ $('#drpSupplier').change(function() {
if(id != '0')
{
var y = ;
-
+
$.each(y, function(idx, obj) {
if(obj.SupplierID === id)
@@ -88,22 +88,14 @@ $('#drpSupplier').change(function() {
$("#SupAddress").val(obj.Address);
$("#SupAddress").val(obj.Address);
- $("#PayableAT").val(obj.PayableAT);
- $("#PaymentTerms").val(obj.PaymentTerms);
- var a=obj.PaymentDays;
- console.log(a);
- if (a=="After")
- {
- //alert();
- document.getElementById("After").checked = true;
-
- }
- else
- document.getElementById("Before").checked = true;
+ PaymentID = obj.PaymentID;
+ $("#PaymentTerms").val(obj.PaymentID);
+
}
});
+
}
else
@@ -142,10 +134,20 @@ $("#txtBasicValue").val('');
{
$("#deptName").val(obj.DepartmentName);
$("#CostCenter").val(obj.CostCenterCode);
+ if(obj.Service_Period!='' && obj.Service_Period!=null){
+ $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
+ $("#FrequencyNo").val(obj.NumberOfService);
+
+ }
+ else{
+ var text='One Time';
+ $("#Frequency").val(text);
+ $("#FrequencyNo").val(1);
+ }
}
});
- $("#AvlBudAmt").val(AvlBudAmt);
+ $("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
// For Binding Material list center for the selected Requistion Number
@@ -239,10 +241,10 @@ $('#EditMaterialCode').change(function() {
$("#EditItemName").val('');
$("#EditUOM").val('');
$("#EditQuantity").val('');
-$("#EditRate").val('');
-$("#txtEditBasicValue").val('');
+//$("#EditRate").val('');
+//$("#txtEditBasicValue").val('');
RequistQuantity = '';
- clearEditTaxField();
+// clearEditTaxField();
if(id != '0')
{
var Material = ;
@@ -299,25 +301,17 @@ function Ratechange(){
{
var txtQuantity = parseFloat( $('#Quantity').val());
var txtUnitPrice = parseFloat($('#Rate').val());
- var Tot = txtQuantity * txtUnitPrice
- $('#txtBasicValue').val(Tot);
+ var frequencyValue = parseFloat($('#FrequencyNo').val());
+ var Tot = txtQuantity * frequencyValue * txtUnitPrice;
+ $('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
//Service Tax calculation
- $('#AfterServiceTax').val(calculateServiceTax($('#txtBasicValue').val())); // calculateServiceTax();
+
+ $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val()));
+ $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val()));
+ $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
- //Edu. cess @2% on service Tax
- $('#AfterEduCess').val( calculateEduess($('#AfterServiceTax').val()));
-
- //Sec. & Higher Edu. cess @1 % on service Tax
-
- $('#AfterSecHighTax').val(calculateHigherEdu($('#AfterServiceTax').val()));
- //Krishi Kalyan tax
-
- $('#AfterKrishiTax').val(calculateKrishiKalyantax($('#txtBasicValue').val()));
- //Swachh Bharat tax
-
- $('#AfterSwachhTax').val(calculateSwachhBharattax($('#txtBasicValue').val()));
-
+
calculateTotalOrdervalue();
var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
@@ -344,26 +338,15 @@ function EditRatechange(){
{
var txtQuantity = parseFloat( $('#EditQuantity').val());
var txtUnitPrice = parseFloat($('#EditRate').val());
- var Tot = txtQuantity * txtUnitPrice
- $('#txtEditBasicValue').val(Tot);
+ var frequencyValue = parseFloat($('#EditFrequencyNo').val());
+ var Tot = txtQuantity * frequencyValue * txtUnitPrice
+ $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
ExceedBudget(Tot, $('#EditAvlBudAmt').val());
- //Service Tax calculation
- $('#EditAfterServiceTax').val(calculateServiceTax($('#txtEditBasicValue').val())); // calculateServiceTax();
-
- //Edu. cess @2% on service Tax
- $('#EditAfterEduCess').val( calculateEduess($('#EditAfterServiceTax').val()));
-
- //Sec. & Higher Edu. cess @1 % on service Tax
-
- $('#EditAfterSecHighTax').val(calculateHigherEdu($('#EditAfterServiceTax').val()));
- //Krishi Kalyan tax
-
- $('#EditAfterKrishiTax').val(calculateKrishiKalyantax($('#txtEditBasicValue').val()));
- //Swachh Bharat tax
-
- $('#EditAfterSwachhTax').val(calculateSwachhBharattax($('#txtEditBasicValue').val()));
+ $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
+ $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
+ $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
calculateTotalEditOrdervalue();
}
@@ -414,79 +397,17 @@ function ExceedQuantityCheck()
return true;
}
}
- function calculateServiceTax(varBasicValue)
- {
-
- var basicValue = parseFloat(varBasicValue);
-
- var ServiceTaxValue = 0.0;
-
- ServiceTaxValue = ;
-
- var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
- return TAXval;// $('#AfterServiceTax').val(TAXval);
-
- }
- function calculateEduess(varAfterServiceTax)
- {
- var ServiceTaxAmount = parseFloat(varAfterServiceTax);
-
- var ServiceTaxValue = 0.0;
-
- ServiceTaxValue = ;
-
- var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
- return TAXval;// $('#AfterEduCess').val(TAXval);
- }
- function calculateHigherEdu(varAfterServiceTax)
- {
- var ServiceTaxAmount = parseFloat(varAfterServiceTax);
-
- var ServiceTaxValue = 0.0;
-
- ServiceTaxValue = ;
-
- var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
- return TAXval;//$('#AfterSecHighTax').val(TAXval);
- }
- function calculateKrishiKalyantax(varBasicValue)
- {
- var basicValue = parseFloat(varBasicValue);
-
- var ServiceTaxValue = 0.0;
-
- ServiceTaxValue = ;
-
- var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
- return TAXval;//$('#AfterKrishiTax').val(TAXval);
- }
- function calculateSwachhBharattax(varBasicValue)
- {
- var basicValue = parseFloat(varBasicValue);
-
- var ServiceTaxValue = 0.0;
-
- ServiceTaxValue = ;
-
- var TAXval = parseFloat(ServiceTaxValue).toFixed(2);
-
- return TAXval; //$('#AfterSwachhTax').val(TAXval);
- }
+
function calculateTotalOrdervalue()
{
var basicValue = parseFloat($('#txtBasicValue').val());
- var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
- var EduCessTaxAmount = parseFloat($('#AfterEduCess').val());
- var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val());
- var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val());
- var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val());
+ var Cgst = parseFloat($('#AfterCgst').val());
+ var Sgst = parseFloat($('#AfterSgst').val());
+ var Igst = parseFloat($('#AfterIgst').val());
+ var OtherAmt = parseFloat($('#OtherAllowances').val());
- var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
+ var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
$('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
@@ -494,65 +415,65 @@ function ExceedQuantityCheck()
function calculateTotalEditOrdervalue()
{
var basicValue = parseFloat($('#txtEditBasicValue').val());
- var ServiceTaxAmount = parseFloat($('#EditAfterServiceTax').val());
- var EduCessTaxAmount = parseFloat($('#EditAfterEduCess').val());
- var SecHighTaxAmount = parseFloat($('#EditAfterSecHighTax').val());
- var KrishiTaxAmount = parseFloat($('#EditAfterKrishiTax').val());
- var SwachhTaxAmount = parseFloat($('#EditAfterSwachhTax').val());
+ var Cgst = parseFloat($('#EditAfterCgst').val());
+ var Sgst = parseFloat($('#EditAfterSgst').val());
+ var Igst = parseFloat($('#EditAfterIgst').val());
+ var OtherAmt = parseFloat($('#EditOtherAllowances').val());
- var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
+ var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
+
+ $('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
- $('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
}
function calculateTaxValue()
{
- var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
- var EduCessTaxAmount = parseFloat($('#AfterEduCess').val());
- var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val());
- var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val());
- var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val());
+ var Cgst = parseFloat($('#AfterCgst').val());
+ var Sgst = parseFloat($('#AfterSgst').val());
+ var Igst = parseFloat($('#AfterIgst').val());
- var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
- return parseFloat(TottaxAmt.toFixed(2));
+ var TottaxAmt = Cgst+ Sgst + Igst;
+ return parseFloat(TottaxAmt).toFixed(2);
}
function clearTaxField()
{
$('#txtBasicValue').val('');
- $('#AfterServiceTax').val('');
- $('#AfterEduCess').val('');
- $('#AfterSecHighTax').val('');
- $('#AfterKrishiTax').val('');
- $('#AfterSwachhTax').val('');
+ $('#AfterCgst').val(0);
+ $('#AfterSgst').val(0);
+ $('#AfterIgst').val(0);
+ $('#Cgst').val(0);
+ $('#Sgst').val(0);
+ $('#Igst').val(0);
$('#TotalOrderValue ').val('');
- $('#Rate').val('');
+ $('#Rate').val(0);
$("#ItemName").val('');
$("#UOM").val('');
$("#Quantity").val('');
- RequistQuantity = '';
+ RequistQuantity = '';
}
function clearEditTaxField()
{
$('#txtEditBasicValue').val('');
- $('#EditAfterEduCess').val('');
- $('#EditAfterSecHighTax').val('');
- $('#EditAfterServiceTax').val('');
- $('#EditAfterKrishiTax').val('');
- $('#EditAfterSwachhTax').val('');
+
$('#EditTotalOrderValue ').val('');
$('#EditRate').val('');
-
+ $('#EditAfterCgst').val(0);
+ $('#EditAfterSgst').val(0);
+ $('#EditAfterIgst').val(0);
+ $('#EditCgst').val(0);
+ $('#EditSgst').val(0);
+ $('#EditIgst').val(0);
$("#EditItemName").val('');
$("#EditUOM").val('');
$("#EditQuantity").val('');
RequistQuantity = '';
}
-$(document).ready(function () {
+/* $(document).ready(function () {
$('#Date').click(function () {
//for Date range selection
$('#Schedulediv').hide();
@@ -563,7 +484,7 @@ $(document).ready(function () {
$('#Deliverydtdiv').hide();
$('#Schedulediv').show();
});
- });
+ }); */
+
+ 'form-label-left ServicePO ','name' => 'ServicePO','id' => 'ServicePO');
+
+ echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
+
+
+
+
+
+ Siddharth Industries - Service Purchase Order
+
+
+
+
+
+
+
+
+
+ 'Selected Requisition Numbers');
+ if(!empty($ReqList))
+
+ {
+ foreach ($ReqList as $SID):
+
+ // print_r($SID->ReqNo);
+ $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy;
+ $ReqType = $SID->ReqType;
+ endforeach;
+ }
+ echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
+
+ ?>
+
+
+
+
+ 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ 'Select Supplier');
+ //print_r( $options);
+
+ if(!empty($Suplist))
+ {
+ foreach ($Suplist as $SID):
+
+
+ $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+ 'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'POType','value' => set_value('POType',SERVICE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+ Select Delivery By
+
+ |
+ "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?> |
+
+ "DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
+
+ |
+
+
+
+
+
+ 'Select Work Status');
+ //print_r( $options);
+
+ if(!empty($WorkStatus))
+ {
+ foreach ($WorkStatus as $WID):
+
+
+ $optionsWork[$WID->StatusCode] = $WID->StatusName;
+
+ endforeach;
+ }
+
+ echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
+
+
+ ?>
+
+
+
+
+ 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Payment Terms ');
+ foreach ($Payment as $pay):
+
+
+
+ $options6[$pay->PaymentID] = $pay->PaymentTerms;
+
+
+ endforeach;
+ }
+
+ echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | SNo |
+ Requisition No |
+ Item Code |
+ Item Description |
+ Quantity |
+ UOM |
+ Rate |
+ Basic Amount |
+ Tax Amount |
+ Total Order Amount |
+ Action |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+ 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances'),'id'=>'TotalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+ 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control' ,'rows' => '10', 'cols' => '40' );
+ echo form_textarea($data); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
| |