sampanna/BBnepal-Accounts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit css

Browse Source
This commit is contained in:
Raju Shrestha 2024-08-25 18:37:52 +05:45
parent 78670b1b95
commit 161703be17
11 changed files with 100 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
account/application/helpers/accounts_helper.php
View File

@ -5,7 +5,6 @@ function generateACCategoryCode($group_id)
$acgroup_code = $ci->db->where("acgroup_id=$group_id")->get("tbl_acgroups")->row()->acgroup_code; $acgroup_code = $ci->db->where("acgroup_id=$group_id")->get("tbl_acgroups")->row()->acgroup_code;
$lastACCategoryCode = $ci->db->select_max("accategory_code")->where("acgroup_id=$group_id")->get("tbl_accategories")->row()->accategory_code; $lastACCategoryCode = $ci->db->select_max("accategory_code")->where("acgroup_id=$group_id")->get("tbl_accategories")->row()->accategory_code;
$category_part = substr($lastACCategoryCode, 1); $category_part = substr($lastACCategoryCode, 1);
$category_part = (float)$category_part + 1; $category_part = (float)$category_part + 1;
//if($category_part<10)$category_part="00".$category_part; //if($category_part<10)$category_part="00".$category_part;
if ($category_part < 10) $category_part = "00" . $category_part; if ($category_part < 10) $category_part = "00" . $category_part;
@ -18,7 +17,6 @@ function generateAccountCode($category_id)
$accategory_code = $ci->db->where("accategory_id=$category_id")->get("tbl_accategories")->row()->accategory_code; $accategory_code = $ci->db->where("accategory_id=$category_id")->get("tbl_accategories")->row()->accategory_code;
$lastAccountCode = $ci->db->select_max("account_code")->where("accategory_id=$category_id")->get("tbl_accounts")->row()->account_code; $lastAccountCode = $ci->db->select_max("account_code")->where("accategory_id=$category_id")->get("tbl_accounts")->row()->account_code;
$account_part = substr($lastAccountCode, 4); $account_part = substr($lastAccountCode, 4);
$account_part = (float)$account_part + 1; $account_part = (float)$account_part + 1;
//if($category_part<10)$category_part="00".$category_part; //if($category_part<10)$category_part="00".$category_part;
if ($account_part < 10) $account_part = "00" . $account_part; if ($account_part < 10) $account_part = "00" . $account_part;
@ -54,13 +52,10 @@ function showAccountCategoriesSelector($fieldName, $fieldID, $condition = "1=1",
$html .= " required"; $html .= " required";
} }
$html .= ">"; $html .= ">";
$html .= "<option value='' " . (($selectedID == '') ? "SELECTED" : "") . ">Select Account Category</option>"; $html .= "<option value='' " . (($selectedID == '') ? "SELECTED" : "") . ">Select Account Category</option>";
foreach ($AccountCategories as $AccountCategory) { foreach ($AccountCategories as $AccountCategory) {
$html .= "<option value='$AccountCategory->accategory_id'" . (($selectedID == $AccountCategory->accategory_id) ? "selected" : "") . ">" . getFieldfromValue("tbl_acgroups", "acgroup_name", "acgroup_id", $AccountCategory->acgroup_id) . " >> $AccountCategory->accategory_name</option>"; $html .= "<option value='$AccountCategory->accategory_id'" . (($selectedID == $AccountCategory->accategory_id) ? "selected" : "") . ">" . getFieldfromValue("tbl_acgroups", "acgroup_name", "acgroup_id", $AccountCategory->acgroup_id) . " >> $AccountCategory->accategory_name</option>";
} }
$html .= "</select>"; $html .= "</select>";
echo $html; echo $html;
} }
@ -68,7 +63,6 @@ function showAccountCategoriesByIds($AccountCategories = array())
{ {
// pre($AccountCategories); //die; // pre($AccountCategories); //die;
$ci = &get_instance(); $ci = &get_instance();
if ($AccountCategories) { if ($AccountCategories) {
$AccountCategories_a = $ci->db->where("status", 1); $AccountCategories_a = $ci->db->where("status", 1);
$AccountCategories_a = $AccountCategories_a->where_in("accategory_id", $AccountCategories); $AccountCategories_a = $AccountCategories_a->where_in("accategory_id", $AccountCategories);
@ -80,11 +74,9 @@ function showAccountCategoriesByIds($AccountCategories = array())
echo implode(", ", $html); echo implode(", ", $html);
} }
} }
function linkVoucher($voucher_id) function linkVoucher($voucher_id)
{ {
if($voucher_id!=0) { if ($voucher_id != 0) {
$ci = &get_instance(); $ci = &get_instance();
$Voucher = $ci->db->where("voucher_id", $voucher_id)->get("tbl_vouchers")->row(); $Voucher = $ci->db->where("voucher_id", $voucher_id)->get("tbl_vouchers")->row();
$Name = $ci->db->where("vouchertype_id", $Voucher->voucher_type)->get("tbl_vouchertypes")->row()->voucher_type . " Voucher # " . $Voucher->voucher_no; $Name = $ci->db->where("vouchertype_id", $Voucher->voucher_type)->get("tbl_vouchertypes")->row()->voucher_type . " Voucher # " . $Voucher->voucher_no;
@ -95,7 +87,6 @@ function linkVoucher($voucher_id)
} }
function linkLedger($Account) function linkLedger($Account)
{ {
$ci = &get_instance(); $ci = &get_instance();
echo "<a class='link' target='_blank' href='" . site_url("accounts/ledger/partyledger?from_date=" . FYStart() . "&to_date=" . FYEnd() . "&account_id=" . $Account->account_id . "&show_ledger=true") . "'>$Account->account_name</a>"; echo "<a class='link' target='_blank' href='" . site_url("accounts/ledger/partyledger?from_date=" . FYStart() . "&to_date=" . FYEnd() . "&account_id=" . $Account->account_id . "&show_ledger=true") . "'>$Account->account_name</a>";
} }
@ -143,15 +134,11 @@ function generateVoucherNo($vouchertype_id = "")
{ {
$ci = &get_instance(); $ci = &get_instance();
$voucherTypeCondition = ($vouchertype_id != "") ? " WHERE voucher_type = '$vouchertype_id'" : ""; $voucherTypeCondition = ($vouchertype_id != "") ? " WHERE voucher_type = '$vouchertype_id'" : "";
$query = $ci->db->query("SELECT MAX(voucher_no) AS voucher_no FROM tbl_vouchers" . $voucherTypeCondition); $query = $ci->db->query("SELECT MAX(voucher_no) AS voucher_no FROM tbl_vouchers" . $voucherTypeCondition);
$row = $query->row(); $row = $query->row();
$newVoucherNo = ($row->voucher_no !== null) ? $row->voucher_no + 1 : 1; $newVoucherNo = ($row->voucher_no !== null) ? $row->voucher_no + 1 : 1;
return $newVoucherNo; return $newVoucherNo;
} }
function countChildCategories($acgroup_id) function countChildCategories($acgroup_id)
{ {
$ci = &get_instance(); $ci = &get_instance();

6
account/application/views/accounts/accategories/list-parents-only.php
View File

@ -14,9 +14,9 @@
<table class="table table-bordered table-striped longdataTable"> <table class="table table-bordered table-striped longdataTable">
<thead> <thead>
<tr> <tr>
<th class="col-2">Type</th> <th class="col-1">Type</th>
<th>Category Name</th> <th>Category Name</th>
<td class="col-1">Action</th> <th class="col-1 text-center">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -26,7 +26,7 @@
break; break;
endforeach; ?> endforeach; ?>
<?php if ($TableRow->parent_category_id == 0) : ?> <?php if ($TableRow->parent_category_id == 0) : ?>
<tr> <tr class="text-center">
<td><?php echo $TableRow->AccountGroup->acgroup_name; ?></td> <td><?php echo $TableRow->AccountGroup->acgroup_name; ?></td>
<td><?php echo $TableRow->accategory_name; ?></td> <td><?php echo $TableRow->accategory_name; ?></td>
<td><a href="<?php echo site_url("master/accategories/edit_parents/$id"); ?>" class="btn btn-info btn-xs"><i class="fas fa-edit"></i> </a> <td><a href="<?php echo site_url("master/accategories/edit_parents/$id"); ?>" class="btn btn-info btn-xs"><i class="fas fa-edit"></i> </a>

1
account/application/views/accounts/balances/bycategory.php
View File

@ -55,7 +55,6 @@ function displayCategoryTree($tree)
.expandable { .expandable {
text-decoration: underline; text-decoration: underline;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">

19
account/application/views/accounts/balancesheet.php
View File

@ -1,5 +1,5 @@
<?php <?php
$t="INSERT INTO tbl_acgroups (acgroup_id, acgroup_code, acgroup_name, posting_side, created_on, created_by, remarks, status, display_order) $t = "INSERT INTO tbl_acgroups (acgroup_id, acgroup_code, acgroup_name, posting_side, created_on, created_by, remarks, status, display_order)
SELECT 5, '5', 'Equity', 'CR', '2023-05-22', 'admin', '', 1, 2 SELECT 5, '5', 'Equity', 'CR', '2023-05-22', 'admin', '', 1, 2
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT 1 FROM tbl_acgroups WHERE acgroup_id = 5 SELECT 1 FROM tbl_acgroups WHERE acgroup_id = 5
@ -12,16 +12,14 @@ $AssetsAccounts = $this->acc->getAccountsByGroup(1);
$LiabilitiesTotal = $this->acc->getAccountBalanceByGroup(2); $LiabilitiesTotal = $this->acc->getAccountBalanceByGroup(2);
$EquityTotal = $this->acc->getAccountBalanceByGroup(5); $EquityTotal = $this->acc->getAccountBalanceByGroup(5);
$AssetsTotal = $this->acc->getAccountBalanceByGroup(1, false); $AssetsTotal = $this->acc->getAccountBalanceByGroup(1, false);
$IncomeAccounts = $this->acc->getAccountsByGroup(3); $IncomeAccounts = $this->acc->getAccountsByGroup(3);
$ExpenseAccounts = $this->acc->getAccountsByGroup(4); $ExpenseAccounts = $this->acc->getAccountsByGroup(4);
$IncomesTotal = $this->acc->getAccountBalanceByGroup(3); $IncomesTotal = $this->acc->getAccountBalanceByGroup(3);
$ExpensesTotal = $this->acc->getAccountBalanceByGroup(4); $ExpensesTotal = $this->acc->getAccountBalanceByGroup(4);
$PL = $IncomesTotal - $ExpensesTotal; $PL = $IncomesTotal - $ExpensesTotal;
$LiabilitiesTotal=$LiabilitiesTotal+$EquityTotal+$PL; $LiabilitiesTotal = $LiabilitiesTotal + $EquityTotal + $PL;
?> ?>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -39,13 +37,11 @@ $LiabilitiesTotal=$LiabilitiesTotal+$EquityTotal+$PL;
</thead> </thead>
<tbody> <tbody>
<tr class="bg-dark"> <tr class="bg-dark">
<th>Liabilities</th> <th>Liabilities</th>
<th class="col-2">Amount</th> <th class="col-2">Amount</th>
<th>Assets</th> <th>Assets</th>
<th class="col-2">Amount</th> <th class="col-2">Amount</th>
</tr> </tr>
<tr class="bg-light"> <tr class="bg-light">
<td colspan="2"> <td colspan="2">
<?php $this->acc->showTable($LiabilitiesAccounts); ?> <?php $this->acc->showTable($LiabilitiesAccounts); ?>
@ -54,33 +50,22 @@ $LiabilitiesTotal=$LiabilitiesTotal+$EquityTotal+$PL;
<td colspan="2"> <td colspan="2">
<?php $this->acc->showTable($AssetsAccounts, false); ?> <?php $this->acc->showTable($AssetsAccounts, false); ?>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr class="bg-light"> <tr class="bg-light">
<th>Net Profit:</th> <th>Net Profit:</th>
<th><?php echo myCurrency($PL); ?></th> <th><?php echo myCurrency($PL); ?></th>
<th></th> <th></th>
<th></th> <th></th>
</tr> </tr>
<tr class="bg-light"> <tr class="bg-light">
<th>Total Liabilities:</th> <th>Total Liabilities:</th>
<th><?php echo myCurrency($LiabilitiesTotal); ?></th> <th><?php echo myCurrency($LiabilitiesTotal); ?></th>
<th>Total Assets: </th> <th>Total Assets: </th>
<th><?php echo myCurrency($AssetsTotal); ?></th> <th><?php echo myCurrency($AssetsTotal); ?></th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div> </div>
</div> </div>

83
account/application/views/accounts/balancesheet_new.php
View File

@ -6,84 +6,10 @@ $BIBAccounts = new BIBAccounts();
table, table,
td, td,
tr { tr {
padding: 0px; padding: 10px;
margin: 0px; margin: 0px;
} }
.group-name {
width: 40%;
font-weight: 600px;
}
.group-total {
width: 10%;
}
.table-gray {
background-color: #eee;
}
.table td,
.table th {
padding: 0px;
margin: 0px;
}
.bg-darker {
background-color: #ddd;
}
td .table {
border: 0px !important;
margin-bottom: 0rem;
}
table td:first-child {
padding-left: 5px;
}
.table-bordered.vertical-borders td,
.table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.table-bordered.vertical-borders thead th {
padding: 0.25rem;
border-top: none;
border-bottom: 2px solid #dee2e6;
}
.table-bordered.vertical-borders tfoot th {
padding: 0.25rem;
border-top: 2px solid #dee2e6;
border-bottom: none;
}
.currency {
font-weight: normal !important;
}
.underline {
text-decoration: underline;
}
.form-control {
display: block;
width: 100%;
height: calc(1.5rem + 1px);
padding: 0.375rem 0.75rem;
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: 0.25rem;
box-shadow: inset 0 0 0 transparent;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
@ -243,9 +169,9 @@ $BIBAccounts = new BIBAccounts();
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<td class="group-name"><b>Particulars</b></td> <td class="group-name "><b>Liabilities</b></td>
<td class="group-total text-right pr-2 "><b>Amount</b></td> <td class="group-total text-right pr-2 "><b>Amount</b></td>
<td class="group-name"><b>Particulars</b></td> <td class="group-name"><b>Assets</b></td>
<td class="group-total text-right pr-2"><b>Amount</b></td> <td class="group-total text-right pr-2"><b>Amount</b></td>
</tr> </tr>
</thead> </thead>
@ -283,6 +209,9 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(5); ?> <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(5); ?>
<table class="table table-bordered vertical-borders" id="TrialBalanceTable"> <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
<?php <?php

31
account/application/views/accounts/cash_flow.php
View File

@ -159,7 +159,6 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> --> </div> -->
</div> </div>
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
<!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> --> <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
<!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> --> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
</form> </form>
@ -241,10 +240,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
<tr> <tr>
<th class="" width="30%"><?php myLang("Cash inflow"); ?></th> <th class="" width="30%"><?php myLang("Cash inflow"); ?></th>
<th class="text-right" width="10%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-2" width="10%"><?php myLang("Amount"); ?></th>
<th class="pl-2" width="30%"><?php echo myLang("Cash outflow"); ?></th> <th class="pl-2" width="30%"><?php echo myLang("Cash outflow"); ?></th>
<th class="text-right" width="10%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-3" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-3" width="10%"><?php myLang("Amount"); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -263,20 +262,19 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr> --> </tr> -->
<?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
<tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
<td class="pr-2" width="70%"><b><?php echo $Incomes['category']; ?></b></td> <td class="pr-2" width="60%"><b><?php echo $Incomes['category']; ?></b></td>
<td width="15%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total1 += $Incomes['amount']; ?> <?php $total1 += $Incomes['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="collapse" data-target="#group_<?php echo $index; ?>">
<td class="pr-2" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td> <td class="pr-2" width="60%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td width="15%"></td> <td width="20%"></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<?php $counter = $index ?> <?php $counter = $index ?>
<?php }; ?> <?php }; ?>
</table> </table>
</td> </td>
@ -292,17 +290,16 @@ $PL = $IncomesTotal - $ExpensesTotal;
</tr> --> </tr> -->
<?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
<tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>"> <tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="" width="70%"><b><?php echo $Expenses['category']; ?></b></td> <td class="" width="60%"><b><?php echo $Expenses['category']; ?></b></td>
<td width="15%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total += $Expenses['amount']; ?> <?php $total += $Expenses['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $counter; ?>"> <tr class="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td> <td class="" width="60%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td>
<td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
<td width="15%"></td> <td width="20%"></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<?php }; ?> <?php }; ?>

16
account/application/views/accounts/ledger/partywise.php
View File

@ -1,42 +1,31 @@
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header bg-primary disabled color-palette"> <div class="card-header bg-primary disabled color-palette">
<h3 class="card-title m-0"><?php echo $pageTitle; ?></h3> <h3 class="card-title m-0"><?php echo $pageTitle; ?></h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<form method="GET" action="#"> <form method="GET" action="#">
<div class="row"> <div class="row">
<div class="col"><?php createNepaliDateInput("from_date", "", "from_date", isset($fromDate_Nepali) ? $fromDate_Nepali : firstDayOfNepaliMonth()); ?></div> <div class="col"><?php createNepaliDateInput("from_date", "", "from_date", isset($fromDate_Nepali) ? $fromDate_Nepali : firstDayOfNepaliMonth()); ?></div>
<div class="col"><?php createNepaliDateInput("to_date", "", "to_date", isset($toDate_Nepali) ? $toDate_Nepali : ''); ?></div> <div class="col"><?php createNepaliDateInput("to_date", "", "to_date", isset($toDate_Nepali) ? $toDate_Nepali : ''); ?></div>
<div class="col"><?php $this->myaccounts->showAccountsCombo("account_id", "", "account_id", "status=1", isset($_GET['account_id']) ? $_GET['account_id'] : 1, $CSSclass = ""); ?> </div> <div class="col"><?php $this->myaccounts->showAccountsCombo("account_id", "", "account_id", "status=1", isset($_GET['account_id']) ? $_GET['account_id'] : 1, $CSSclass = ""); ?> </div>
<div class="col"><?php createButton("show_ledger", "Show Ledger", "show_ledger","Submit", "btn btn-primary"); ?></div> <div class="col"><?php createButton("show_ledger", "Show Ledger", "show_ledger", "Submit", "btn btn-primary"); ?></div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<div id="dataTable_Commands"> <div id="dataTable_Commands">
</div> </div>
<?php <?php
if(!isset($account_id)){ if (!isset($account_id)) {
$account_id = 1; $account_id = 1;
} }
?> ?>
<?php if (isset($account_id) && $account_id != "") { <?php if (isset($account_id) && $account_id != "") {
$fromDate = NepaliToEnglishDate(isset($_GET['from_date']) ? $_GET['from_date'] : firstDayOfNepaliMonth()); $fromDate = NepaliToEnglishDate(isset($_GET['from_date']) ? $_GET['from_date'] : firstDayOfNepaliMonth());
$toDate = isset($_GET['to_date']) ? $_GET['to_date'] : Today(); $toDate = isset($_GET['to_date']) ? $_GET['to_date'] : Today();
@ -67,4 +56,3 @@
</div> </div>
</div> </div>
</div> </div>

98
account/application/views/accounts/receipt_and_payment.php
View File

@ -8,7 +8,6 @@ $ExpenseAccounts = $this->acc->getAccountsByGroup(4);
$IncomesTotal = $this->acc->getAccountBalanceByGroup(3); $IncomesTotal = $this->acc->getAccountBalanceByGroup(3);
$ExpensesTotal = $this->acc->getAccountBalanceByGroup(4); $ExpensesTotal = $this->acc->getAccountBalanceByGroup(4);
$PL = $IncomesTotal - $ExpensesTotal; $PL = $IncomesTotal - $ExpensesTotal;
?> ?>
<style> <style>
table, table,
@ -97,24 +96,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
; ;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-header"> <div class="card-header">
<h3 class="card-title mt-1">Receipts And Payments <?php //echo $pageTitle; <h3 class="card-title mt-1">Receipts And Payments <?php //echo $pageTitle;
?> </h3> ?> </h3>
<div class="card-tools"> <div class="card-tools">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown --> <!-- button with a dropdown -->
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52"> <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
@ -166,8 +156,6 @@ $PL = $IncomesTotal - $ExpensesTotal;
<button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52"> <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
Export Export
</button> </button>
<!-- <div class="dropdown-menu" role="menu"> <!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a> <a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a> <a href="#" class="dropdown-item">Pdf</a>
@ -176,9 +164,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> --> </div> -->
</div> </div>
<!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> --> <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
</form> </form>
<script> <script>
function resetForm() { function resetForm() {
@ -192,39 +178,36 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> </div>
<!-- /.card-tools --> <!-- /.card-tools -->
</div> </div>
<!-- <div class="card-body"> <!-- <div class="card-body">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<div class="row align-items-end"> <div class="row align-items-end">
<div class="col-2"> <div class="col-2">
<div class="form-group"> <div class="form-group">
<label for="fromDate"><?php myLang("Starting Period"); ?></label> <label for="fromDate"><?php //myLang("Starting Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period"> <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php //echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="form-group"> <div class="form-group">
<label for="toDate"><?php myLang("Ending Period"); ?></label> <label for="toDate"><?php //myLang("Ending Period"); ?></label>
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period"> <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php //echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
</div> </div>
</div> </div>
<div class="col-1 text-center"> <div class="col-1 text-center">
<div class="form-group"> <div class="form-group">
<label for="showOB"><?php myLang("Opening"); ?></label> <label for="showOB"><?php //myLang("Opening"); ?></label>
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : "CHECKED"; ?>> <input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : "CHECKED"; ?>>
</div> </div>
</div> </div>
<div class="col-1 text-center"> <div class="col-1 text-center">
<div class="form-group"> <div class="form-group">
<label for="showClosing"><?php myLang("Closing"); ?></label> <label for="showClosing"><?php //myLang("Closing"); ?></label>
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : "CHECKED"; ?>> <input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : "CHECKED"; ?>>
</div> </div>
</div> </div>
<div class="col-1 text-center"> <div class="col-1 text-center">
<div class="form-group"> <div class="form-group">
<label for="showPeriod"><?php myLang("Period"); ?></label> <label for="showPeriod"><?php //myLang("Period"); ?></label>
<input type="checkbox" class="form-control " name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>> <input type="checkbox" class="form-control " name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
</div> </div>
</div> </div>
@ -237,9 +220,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<script> <script>
function resetForm() { function resetForm() {
document.getElementById("fromDate").value = "2078-4-1"; document.getElementById("fromDate").value = "2078-4-1";
@ -249,23 +230,20 @@ $PL = $IncomesTotal - $ExpensesTotal;
document.getElementById("FilterForm").submit(); document.getElementById("FilterForm").submit();
} }
</script> </script>
</div> --> </div> -->
</div> </div>
<div class="card"> <div class="card">
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?> <?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?>
<table class="table table-head-fixed table-bordered g-0" id="TrialBalanceTable"> <table class="table table-head-fixed table-bordered g-0" id="TrialBalanceTable">
<thead> <thead>
<tr> <tr>
<th class="" width="35%"><?php myLang("Receipts"); ?></th> <th class="" width="30%"><?php myLang("Receipts"); ?></th>
<th class="text-right" width="15%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-2" width="10%"><?php myLang("Amount"); ?></th>
<th class="" width="35%"><?php echo myLang("Payments"); ?></th> <th class="" width="30%"><?php echo myLang("Payments"); ?></th>
<th class="text-right" width="15%"></th> <th class="text-right" width="10%"></th>
<th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th> <th class="text-right pr-2" width="10%"><?php myLang("Amount"); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -281,32 +259,26 @@ $PL = $IncomesTotal - $ExpensesTotal;
<td class="" width="70%"><b><?php echo $Incomes['group']; ?></b></td> <td class="" width="70%"><b><?php echo $Incomes['group']; ?></b></td>
<td width="15%"></td> <td width="15%"></td>
<td class="text-right" width="15%"><u><?php echo myCurrency($Incomes['amount']); ?></u></td> <td class="text-right" width="15%"><u><?php echo myCurrency($Incomes['amount']); ?></u></td>
</tr--> </tr-->
<?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
<?php $index++; ?> <?php $index++; ?>
<tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
<td class="" width="70%"><b><?php echo $Incomes['category']; ?></b></td> <td class="" width="60%"><b><?php echo $Incomes['category']; ?></b></td>
<td width="15%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total1 += $Incomes['amount']; ?> <?php $total1 += $Incomes['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $index; ?>"> <tr class="collapse" data-target="#group_<?php echo $index; ?>">
<td class="pr-2" width="70%"> <td class="pr-2" width="60%">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?>
</td> </td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Incomes['amount']); ?></td>
<td width="20%"></td>
<td width="15%"></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<?php $counter = $index ?> <?php $counter = $index ?>
<?php }; ?> <?php }; ?>
</table> </table>
</td> </td>
<td colspan=3 class="p-0"> <td colspan=3 class="p-0">
@ -318,36 +290,26 @@ $PL = $IncomesTotal - $ExpensesTotal;
<td class="" width="70%"><b><?php echo $Expenses['group']; ?></b></td> <td class="" width="70%"><b><?php echo $Expenses['group']; ?></b></td>
<td width="15%"></td> <td width="15%"></td>
<td class="text-right" width="15%"><u><?php echo myCurrency($Expenses['amount']); ?></u></td> <td class="text-right" width="15%"><u><?php echo myCurrency($Expenses['amount']); ?></u></td>
</tr--> </tr-->
<?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?> <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
<?php $counter++; ?> <?php $counter++; ?>
<tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>"> <tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="pr-2" width="70%"><b><?php echo $Expenses['category']; ?></b></td> <td class="pr-2" width="60%"><b><?php echo $Expenses['category']; ?></b></td>
<td width="15%"></td> <td width="20%"></td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
</tr> </tr>
<?php else : ?> <?php else : ?>
<?php $total += $Expenses['amount']; ?> <?php $total += $Expenses['amount']; ?>
<tr class="collapse" data-target="#group_<?php echo $counter; ?>"> <tr class="collapse" data-target="#group_<?php echo $counter; ?>">
<td class="" width="70%"> <td class="" width="60%">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<?php echo $Expenses['account']; ?> <?php echo $Expenses['account']; ?>
</td> </td>
<td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td> <td class="text-right pr-2" width="20%"><?php echo myCurrency($Expenses['amount']); ?></td>
<td width="15%"></td> <td width="20%"></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<?php }; ?> <?php }; ?>
</table> </table>
</td> </td>
</tr> </tr>
@ -370,9 +332,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
<th></th> <th></th>
<td class="pr-2"><?php echo myCurrency($balance_fi); ?></td> <td class="pr-2"><?php echo myCurrency($balance_fi); ?></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<tr> <tr>
<th class="pl-2">Total</th> <th class="pl-2">Total</th>
<th></th> <th></th>
@ -382,19 +342,11 @@ $PL = $IncomesTotal - $ExpensesTotal;
<td class="pr-2"><?php echo myCurrency($total); ?></td> <td class="pr-2"><?php echo myCurrency($total); ?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</section> </section>
<?php function footerFunctions() <?php function footerFunctions()
{ ?> { ?>
<script> <script>

6
account/application/views/fiscalyear/list.php
View File

@ -95,12 +95,12 @@
<table class="table table-bordered table-striped longdataTable"> <table class="table table-bordered table-striped longdataTable">
<thead> <thead>
<tr> <tr>
<th>Fiscal Year </th> <th class="col-2">Fiscal Year </th>
<th> Code</th> <th class="col-4"> Code</th>
<th>From</th> <th>From</th>
<th>To</th> <th>To</th>
<!-- <th>Created By</th> --> <!-- <th>Created By</th> -->
<th class="col-2 text-center">Action</th> <th class="col-1 text-center">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
account/application/views/inventory/purchases/list.php
View File

@ -12,7 +12,7 @@
<table class="table table-bordered table-striped dataTable"> <table class="table table-bordered table-striped dataTable">
<thead> <thead>
<tr> <tr>
<th><?php myLang('S.N'); ?></th> <th class="text-center"><?php myLang('S.N'); ?></th>
<th><?php myLang('Date'); ?></th> <th><?php myLang('Date'); ?></th>
<th><?php myLang('Purchase Transaction'); ?></th> <th><?php myLang('Purchase Transaction'); ?></th>
<th class="text-center"><?php myLang('Amount'); ?></th> <th class="text-center"><?php myLang('Amount'); ?></th>

4
account/application/views/inventory/sales/list.php
View File

@ -12,7 +12,7 @@
<table class="table table-bordered table-striped dataTable"> <table class="table table-bordered table-striped dataTable">
<thead> <thead>
<tr> <tr>
<th class="table-col col-1"><?php myLang('Sales Voucher #'); ?></th> <th class="table-col col-1 text-center"><?php myLang('Sales Voucher #'); ?></th>
<th width="10%"><?php myLang('Date'); ?></th> <th width="10%"><?php myLang('Date'); ?></th>
<th><?php myLang('Transaction'); ?></th> <th><?php myLang('Transaction'); ?></th>
<th class="table-col col-1 text-center"><?php myLang('Amount'); ?></th> <th class="table-col col-1 text-center"><?php myLang('Amount'); ?></th>
@ -22,7 +22,7 @@
<tbody> <tbody>
<?php foreach ($SalesRecords as $TableRow) : ?> <?php foreach ($SalesRecords as $TableRow) : ?>
<tr> <tr>
<td><?php echo $TableRow->sales_id; ?></td> <td class="text-center"><?php echo $TableRow->sales_id; ?></td>
<td><?php echo $TableRow->sales_date; ?></td> <td><?php echo $TableRow->sales_date; ?></td>
<td><b><?php echo $this->myaccounts->getAccountDetails($TableRow->accounts_id)->account_name; ?></b> <td><b><?php echo $this->myaccounts->getAccountDetails($TableRow->accounts_id)->account_name; ?></b>
<div class="row ml-2 mr-2" style="border-bottom: 1px solid;"> <div class="row ml-2 mr-2" style="border-bottom: 1px solid;">