diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 2560f3ff..edaec602 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -75,6 +75,7 @@ class Payslip extends BaseController $loan = []; $loanHistory = []; $loan_id = 0; + $BalanceAdvance = 0; if(is_null($result->Loan_ID)){ }else{ @@ -95,6 +96,7 @@ class Payslip extends BaseController 'Due_Date' => $PayOn, ]; + $BalanceAdvance = $result->Loan_Amount - ($result->Paid_Amount + $result->Loan_Recovered); } @@ -121,14 +123,18 @@ class Payslip extends BaseController 'Festival_Bonus' => $result->Festival_Bonus, 'TotalSalary' => $result->Estimate, 'Advance' => $result->Loan_Recovered, - 'BalanceAdvance' => 0, + 'BalanceAdvance' => $BalanceAdvance, 'LessAdvance' => 0, 'BankAccountNumber' => $result->BankAccountNo, 'PFNumber' => $result->PFNO, 'ESINumber' => $result->ESINO, 'UANNO' => $result->PFNO, ]; - + // print_r($result); + // print_r($loan); + // print_r($loanHistory); + // print_r($data); + // die; $insert = $this->payroll_model->insertPayroll($data); if($insert){ if(count($loan)){ @@ -697,7 +703,7 @@ class Payslip extends BaseController $data['pf'] = $pf; $data['over_time'] = $ot; -// dd($data); +// dd($data); $this->global['pageTitle'] = 'Payroll Monthly Inputs'; $this->loadViews("monthlypayinputs", $this->global, $data, NULL); } diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 803ab4d6..86f4a1d4 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1077,1249 +1077,1255 @@ if (!empty($getlogpodtl)) {
- - > IS THIS OPEN ORDER FORMAT - - + + > IS THIS OPEN ORDER FORMAT + +
-
+
- - - - - - - - - - - - - - + + - - + Schedule_Type != 'Recurring') { - $FrequencyNo = intval(1); - $Frequency = 'One Time'; - } else { - $FrequencyNo = $record->NumberOfService; - $Frequency = $record->Service_Period; - } + foreach ($POItem as $record) { + $index = $index + 1; + if ($record->Schedule_Type != 'Recurring') { + $FrequencyNo = intval(1); + $Frequency = 'One Time'; + } else { + $FrequencyNo = $record->NumberOfService; + $Frequency = $record->Service_Period; + } - ?> - - - - - - - + ?> + + + + + + + - + - + - - - - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - After_CGST; - $TotalSgst = $TotalSgst + $record->After_SGST; - $TotalIgst = $TotalIgst + $record->After_IGST; - $OtherAmt = $OtherAmt + $record->otherallowance; - $TotalSummary = $TotalSummary + $record->TotalValue; + + if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?> + + + + After_CGST; + $TotalSgst = $TotalSgst + $record->After_SGST; + $TotalIgst = $TotalIgst + $record->After_IGST; + $OtherAmt = $OtherAmt + $record->otherallowance; + $TotalSummary = $TotalSummary + $record->TotalValue; - $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue * $FrequencyNo; - } - ?> - BasicValue * $FrequencyNo; + } + ?> + - + } + ?> +
SNoRequisition NoItem CodeItem NameQuantityUOMRate Basic Amount Tax Amount Total Order Amount Action
Action
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?> - - -    
+ + +    
-
-
- - '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); - ?> +
+
+ + '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); + ?> +
+
+
+ +
+ + + 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> + +
+
+ +
+
+ + 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); + echo form_textarea($data); + ?> +
+
+
+
+ + + +
+ + +
+
-
- - 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($TotalSummary, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
+ + +
+ + + +
-
- -
- - - 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); - echo form_textarea($data); - ?> - -
-
- -
-
- - 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); - echo form_textarea($data); - ?> -
-
-
-
- -
- -
- - -
- -
- - -
- - - - -
- - - - - - + + - - + + - - - + + + - - $gd) { + + $gd) { - ?> - - - - - - - - - -
Bill No FileFileAction
Action
BillNo ?>FilePath)) ? $gd->FilePath : "No File"; ?> - FilePath)) { ?> - - -
-
+ ?> + + BillNo ?> + + + FilePath)) ? $gd->FilePath : "No File"; ?> + + FilePath)) { ?> + + + + + + + +
- -
-
- + +
+
+
- - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - + + + - - + + - - - - entity == 'PO DateChanged') { - $oldValue = date('d-m-Y', strtotime($oldpo->oldValue)); - } else { - $oldValue = $oldpo->oldValue; - } ?> - + + + entity == 'PO DateChanged') { + $oldValue = date('d-m-Y', strtotime($oldpo->oldValue)); + } else { + $oldValue = $oldpo->oldValue; + } ?> + - entity == 'PO DateChanged') { - $newValue = date('d-m-Y', strtotime($oldpo->newValue)); - } else { - $newValue = $oldpo->newValue; - } ?> - - + entity == 'PO DateChanged') { + $newValue = date('d-m-Y', strtotime($oldpo->newValue)); + } else { + $newValue = $oldpo->newValue; + } ?> + + - + - - - - -
SnoPONOLineItemNoEntityOldValueNewValueUpdatedByUpdateOn
SnoPONOLineItemNoEntityOldValueNewValueUpdatedByUpdateOn
PONO ?>PONO ?>LineItemNos; ?>entity ?>SupplierName; ?>LineItemNos; ?>entity ?>SupplierName; ?>FirstName ?>FirstName ?>UpdatedOn); - echo $date->format('d-m-Y'); ?>UpdatedOn); + echo $date->format('d-m-Y'); ?>
-
-
- -
- -

- - - - - - - - -   Cancel - -   Save - -   Submit -   Approve - -   OK -   Submit - -   OK -   Submit - - -
- -
- -
- -
- - - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($StatusName) && !empty($StatusName)) { - if (isset($statusMappings[$StatusName])) { - echo $statusMappings[$StatusName]; - } else { - echo $StatusName; - } - } else { - echo "Status not provided"; - } - ?> + + + + +
-
-
- - - - - - - - + + - - - + + +