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

salesvspurchase and final accounts pages change

Browse Source
This commit is contained in:
Sampanna Rimal 2024-08-05 13:13:06 +05:45
parent c16163bf01
commit d164f3139d
18 changed files with 743 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account/application/controllers/accounts/Vouchers.php
View File

@ -264,7 +264,7 @@ class Vouchers extends CI_Controller
$entry_no++; $entry_no++;
echo json_encode(['status' => 'success']); // echo json_encode(['status' => 'success']);
loadview("accounts/vouchers/create", $data); loadview("accounts/vouchers/create", $data);
break; break;
} }

2
account/application/controllers/inventory/Items.php
View File

@ -60,8 +60,10 @@ class Items extends CI_Controller
$item_code = filter_var($_POST['item_code']); $item_code = filter_var($_POST['item_code']);
$this->db->where('status',1); $this->db->where('status',1);
$this->db->where('item_id !=', $id); $this->db->where('item_id !=', $id);
$this->db->group_start();
$this->db->where('title', $title); $this->db->where('title', $title);
$this->db->or_where('item_code', $item_code); $this->db->or_where('item_code', $item_code);
$this->db->group_end();
$query = $this->db->get('tbl_items'); $query = $this->db->get('tbl_items');
if($query->num_rows() > 0){ if($query->num_rows() > 0){

2
account/application/helpers/bibhelper_helper.php
View File

@ -153,7 +153,7 @@ function showCreateButton($url, $text = "Create")
function showDetailsButton($url, $text = "Details") function showDetailsButton($url, $text = "Details")
{ {
?> ?>
<a href="<?php echo site_url($url); ?>" class="btn btn-primary btn-xs" title="<?php echo myLang($text); ?>"><i class="fas fa-glasses"></i> <?php //echo myLang($text); <a href="<?php echo site_url($url); ?>" class="btn btn-primary btn-xs" title="<?php echo myLang($text); ?>"><i class="fas fa-eye"></i> <?php //echo myLang($text);
?></a> ?></a>
<?php <?php
} }

4
account/application/views/accounts/accountheads/edit.php
View File

@ -180,7 +180,9 @@
</div> </div>
<!--COL END--> <!--COL END-->
</div> </div>
<button type="reset" class="btn btn-default btn-sm">Reset</button> <button class="btn btn-primary btn-sm" type="submit" name="submit">Save</button> <p align="right">
<button style="padding: 6px 24px; border-radius: 2px; border: 1px solid DodgerBlue" class="btn btn-default btn-sm">Reset</button> <button style="padding: 6px 24px; border-radius: 2px;" class="btn btn-primary btn-sm" type="submit" name="submit">Save</button>
</p>
</form> </form>
</div> </div>
</div> </div>

23
account/application/views/accounts/accountheads/list.php
View File

@ -40,49 +40,33 @@
<div class="row" id="additionalFields" style="display: none;"> <div class="row" id="additionalFields" style="display: none;">
<!-- Additional Fields for Sundry Debtors or Sundry Creditors --> <!-- Additional Fields for Sundry Debtors or Sundry Creditors -->
<div class="row">
<div class="col"> <div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partyaddress">Address</label> <label for="account_partyaddress">Address</label>
<input type="text" class="form-control" id="account_partyaddress" name="account_partyaddress"> <input type="text" class="form-control" id="account_partyaddress" name="account_partyaddress">
</div> </div>
</div>
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partypan">PAN No.</label> <label for="account_partypan">PAN No.</label>
<input type="text" class="form-control" id="account_partypan" name="account_partypan"> <input type="text" class="form-control" id="account_partypan" name="account_partypan">
</div> </div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partycontact">Phone No.</label> <label for="account_partycontact">Phone No.</label>
<input type="text" class="form-control" id="account_partycontact" name="account_partycontact"> <input type="text" class="form-control" id="account_partycontact" name="account_partycontact">
</div> </div>
</div>
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partyemail">Email</label> <label for="account_partyemail">Email</label>
<input type="email" class="form-control" id="account_partyemail" name="account_partyemail"> <input type="email" class="form-control" id="account_partyemail" name="account_partyemail">
</div> </div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partycontactperson">Contact Person Name</label> <label for="account_partycontactperson">Contact Person Name</label>
<input type="text" class="form-control" id="account_partycontactperson" name="account_partycontactperson"> <input type="text" class="form-control" id="account_partycontactperson" name="account_partycontactperson">
</div> </div>
</div>
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_partycontactpersoncontact">Contact Person No.</label> <label for="account_partycontactpersoncontact">Contact Person No.</label>
<input type="text" class="form-control" id="account_partycontactpersoncontact" name="account_partycontactpersoncontact"> <input type="text" class="form-control" id="account_partycontactpersoncontact" name="account_partycontactpersoncontact">
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row" id="bankFields" style="display: none;"> <div class="row" id="bankFields" style="display: none;">
<!-- Additional Fields for Bank Account --> <!-- Additional Fields for Bank Account -->
@ -91,13 +75,12 @@
<label for="account_number">Account No.</label> <label for="account_number">Account No.</label>
<input type="text" class="form-control" id="account_number" name="account_number"> <input type="text" class="form-control" id="account_number" name="account_number">
</div> </div>
</div>
<div class="col">
<div class="form-group"> <div class="form-group">
<label for="account_branch">Branch</label> <label for="account_branch">Account Branch</label>
<input type="text" class="form-control" id="account_branch" name="account_branch"> <input type="text" class="form-control" id="account_branch" name="account_branch">
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -204,7 +187,7 @@
echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td> echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td>
<td class="text-center"> <td class="text-center">
<a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-copy"></i> </a> <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-eye"></i> </a>
<a href="<?php echo site_url("accounts/accountheads/edit/$id"); ?>" class="btn btn-info btn-xs" title="Edit"><i class="fas fa-edit"></i> </a> <a href="<?php echo site_url("accounts/accountheads/edit/$id"); ?>" class="btn btn-info btn-xs" title="Edit"><i class="fas fa-edit"></i> </a>
<a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a> <a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a>
</td> </td>

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

@ -10,52 +10,65 @@ $BIBAccounts = new BIBAccounts();
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.group-name { .group-name {
width: 40%; width: 40%;
font-weight: 600px; font-weight: 600px;
} }
.group-total { .group-total {
width: 10%; width: 10%;
} }
.table-gray { .table-gray {
background-color: #eee; background-color: #eee;
} }
.table td, .table td,
.table th { .table th {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.bg-darker { .bg-darker {
background-color: #ddd; background-color: #ddd;
} }
td .table { td .table {
border: 0px !important; border: 0px !important;
margin-bottom: 0rem; margin-bottom: 0rem;
} }
table td:first-child { table td:first-child {
padding-left: 5px; padding-left: 5px;
} }
.table-bordered.vertical-borders td, .table-bordered.vertical-borders td,
.table-bordered.vertical-borders th { .table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }
.table-bordered.vertical-borders thead th { .table-bordered.vertical-borders thead th {
padding: 0.25rem; padding: 0.25rem;
border-top: none; border-top: none;
border-bottom: 2px solid #dee2e6; border-bottom: 2px solid #dee2e6;
} }
.table-bordered.vertical-borders tfoot th { .table-bordered.vertical-borders tfoot th {
padding: 0.25rem; padding: 0.25rem;
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
border-bottom: none; border-bottom: none;
} }
.currency { .currency {
font-weight: normal !important; font-weight: normal !important;
} }
.underline { .underline {
text-decoration: underline; text-decoration: underline;
} }
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
@ -78,19 +91,95 @@ $BIBAccounts = new BIBAccounts();
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary "> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3> <h3 class="card-title"><?php echo $pageTitle; ?> </h3>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button> </button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<div class="form-group">
<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">
</div>
<div class="form-group">
<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">
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-check">
<input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div>
</div>
<div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<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> -->
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
document.getElementById("showOB").checked = <?php echo "false"; ?>;
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
document.getElementById("FilterForm").submit();
}
</script>
</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">
@ -108,13 +197,13 @@ $BIBAccounts = new BIBAccounts();
<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" : ""; ?>> <input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "" : "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" : ""; ?>> <input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "" : "CHECKED"; ?>>
</div> </div>
</div> </div>
<div class="col-1 text-center"> <div class="col-1 text-center">
@ -145,7 +234,7 @@ $BIBAccounts = new BIBAccounts();
} }
</script> </script>
</div> </div> -->
</div> </div>
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
@ -155,12 +244,13 @@ $BIBAccounts = new BIBAccounts();
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> <!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> -->
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
Collapse</button>
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-body p-0"> <div class="card-body p-0">
<!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle
Collapse</button> -->
<?php <?php
// echo $_POST['showClosing']; // echo $_POST['showClosing'];
@ -355,7 +445,8 @@ $BIBAccounts = new BIBAccounts();
</table> </table>
<?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null)); ?> <?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null));
?>
@ -380,7 +471,8 @@ function footerfunctions()
document.getElementById("toggleShowAll").addEventListener("click", function() { document.getElementById("toggleShowAll").addEventListener("click", function(e) {
e.preventDefault();
var nestedRows = document.getElementsByClassName("collapse"); var nestedRows = document.getElementsByClassName("collapse");
for (var i = 0; i < nestedRows.length; i++) { for (var i = 0; i < nestedRows.length; i++) {
if (nestedRows[i].classList.contains("show")) { if (nestedRows[i].classList.contains("show")) {

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

@ -101,18 +101,94 @@ $PL = $IncomesTotal - $ExpensesTotal;
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary "> <div class="card card-primary card-outline">
<div class="card-header "> <div class="card-header ">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle; <h3 class="card-title">Cash Flow<?php //echo $pageTitle;
?> </h3> ?> </h3>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button> </button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<div class="form-group">
<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">
</div>
<div class="form-group">
<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">
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-check">
<input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div>
</div>
<div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<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> -->
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
document.getElementById("showOB").checked = <?php echo "false"; ?>;
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
document.getElementById("FilterForm").submit();
}
</script>
</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">
@ -130,13 +206,13 @@ $PL = $IncomesTotal - $ExpensesTotal;
<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" : ""; ?>> <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" : ""; ?>> <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">
@ -167,13 +243,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
} }
</script> </script>
</div> </div> -->
</div> </div>
<div class="card"> <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
<div class="card-header">
<div class="card card-primary card-outline">
<!-- <div class="card-header">
<h4 class="card-title">Cash Flow</h4> <h4 class="card-title">Cash Flow</h4>
</div> </div> -->
<div class="card-body table-responsive p-0"> <div class="card-body table-responsive p-0">

124
account/application/views/accounts/pl_new.php
View File

@ -15,51 +15,64 @@ $BIBAccounts = new BIBAccounts();
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.group-name { .group-name {
width: 40%; width: 40%;
} }
.group-total { .group-total {
width: 10%; width: 10%;
} }
.table-gray { .table-gray {
background-color: #eee; background-color: #eee;
} }
.table td, .table td,
.table th { .table th {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.bg-darker { .bg-darker {
background-color: #ddd; background-color: #ddd;
} }
td .table { td .table {
border: 0px !important; border: 0px !important;
margin-bottom: 0rem; margin-bottom: 0rem;
} }
table td:first-child { table td:first-child {
padding-left: 5px; padding-left: 5px;
} }
.table-bordered.vertical-borders td, .table-bordered.vertical-borders td,
.table-bordered.vertical-borders th { .table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }
.table-bordered.vertical-borders thead th { .table-bordered.vertical-borders thead th {
padding: 0.25rem; padding: 0.25rem;
border-top: none; border-top: none;
border-bottom: 2px solid #dee2e6; border-bottom: 2px solid #dee2e6;
} }
.table-bordered.vertical-borders tfoot th { .table-bordered.vertical-borders tfoot th {
padding: 0.25rem; padding: 0.25rem;
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
border-bottom: none; border-bottom: none;
} }
.currency { .currency {
font-weight: normal !important; font-weight: normal !important;
} }
.underline { .underline {
text-decoration: underline; text-decoration: underline;
} }
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
@ -82,63 +95,80 @@ $BIBAccounts = new BIBAccounts();
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary "> <div class="card card-primary card-outline ">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> </h3> <h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
</div>
<!-- /.card-tools -->
</div>
<div class="card-body">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2"> <!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<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 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="dropdown-divider"></div>
<div class="form-group"> <div class="form-check">
<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" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<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" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<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"; ?>>
</div>
</div>
<div class="col">
<div class="form-group d-flex justify-content-end">
<button type="submit" class="btn btn-primary mr-2">Filter</button> <input class="form-check-input" type="checkbox">
<button type="submit" class="btn btn-success mr-2">Export</button> <label class="form-check-label">Select
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button> All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div> </div>
</div> </div>
<div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div> </div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<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> -->
</form> </form>
<script> <script>
@ -154,12 +184,13 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
</div> </div>
</div>
<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">
<button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
<div class="card card-primary card-outline "> <div class="card card-primary card-outline ">
<div class="card-body p-0"> <div class="card-body p-0">
@ -205,9 +236,11 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php foreach ($AccountGroups as $group) : ?> <?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name"><b><?php //echo $group->acgroup_name; ?></b></td> <td class="group-name"><b><?php //echo $group->acgroup_name;
?></b></td>
<td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td> <td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
?></td>
</tr> </tr>
<tr> <tr>
<td colspan="7" class="group-details p-0" width="85%"> <td colspan="7" class="group-details p-0" width="85%">
@ -246,8 +279,10 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php foreach ($AccountGroups as $group) : ?> <?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name" width="85%"> <?php //echo $group->acgroup_name; ?></td> <td class="group-name" width="85%"> <?php //echo $group->acgroup_name;
<td class="group-total" width="15%"><?php //echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td> ?></td>
<td class="group-total" width="15%"><?php //echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0);
?></td>
</tr> </tr>
<tr> <tr>
<td colspan="7" class="group-details p-0"> <td colspan="7" class="group-details p-0">
@ -360,9 +395,6 @@ function footerfunctions()
{ {
?> ?>
<script> <script>
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
// Trigger click event on page load // Trigger click event on page load
document.getElementById("toggleShowAll").click(); document.getElementById("toggleShowAll").click();

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

@ -17,51 +17,64 @@ $PL = $IncomesTotal - $ExpensesTotal;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.group-name { .group-name {
width: 40%; width: 40%;
} }
.group-total { .group-total {
width: 10%; width: 10%;
} }
.table-gray { .table-gray {
background-color: #eee; background-color: #eee;
} }
.table td, .table td,
.table th { .table th {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.bg-darker { .bg-darker {
background-color: #ddd; background-color: #ddd;
} }
td .table { td .table {
border: 0px !important; border: 0px !important;
margin-bottom: 0rem; margin-bottom: 0rem;
} }
table td:first-child { table td:first-child {
padding-left: 5px; padding-left: 5px;
} }
.table-bordered.vertical-borders td, .table-bordered.vertical-borders td,
.table-bordered.vertical-borders th { .table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }
.table-bordered.vertical-borders thead th { .table-bordered.vertical-borders thead th {
padding: 0.25rem; padding: 0.25rem;
border-top: none; border-top: none;
border-bottom: 2px solid #dee2e6; border-bottom: 2px solid #dee2e6;
} }
.table-bordered.vertical-borders tfoot th { .table-bordered.vertical-borders tfoot th {
padding: 0.25rem; padding: 0.25rem;
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
border-bottom: none; border-bottom: none;
} }
.currency { .currency {
font-weight: normal !important; font-weight: normal !important;
} }
.underline { .underline {
text-decoration: underline; text-decoration: underline;
} }
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
@ -88,21 +101,98 @@ $PL = $IncomesTotal - $ExpensesTotal;
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary "> <div class="card card-primary card-outline ">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Receipts And Payments <?php //echo $pageTitle; ?> </h3> <h3 class="card-title">Receipts And Payments <?php //echo $pageTitle;
?> </h3>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i> <form method="post" action="" id="FilterForm">
<!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button> </button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<div class="form-group">
<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">
</div>
<div class="form-group">
<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">
</div>
</div>
<div class="dropdown-divider"></div>
<div class="form-check">
<input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div>
</div>
<div class="dropdown-divider"></div>
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div>
</div>
<div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div>
<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> -->
</form>
<script>
function resetForm() {
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
document.getElementById("showOB").checked = <?php echo "false"; ?>;
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
document.getElementById("FilterForm").submit();
}
</script>
</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">
@ -120,13 +210,13 @@ $PL = $IncomesTotal - $ExpensesTotal;
<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" : ""; ?>> <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" : ""; ?>> <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">
@ -157,12 +247,12 @@ $PL = $IncomesTotal - $ExpensesTotal;
} }
</script> </script>
</div> </div> -->
</div> </div>
<div class="card"> <div class="card">
<div class="card-body table-responsive p-0"> <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"> <table class="table table-head-fixed table-bordered g-0">
<thead> <thead>

129
account/application/views/accounts/trialbalance_new.php
View File

@ -14,51 +14,64 @@ $BIBAccounts = new BIBAccounts();
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.group-name { .group-name {
width: 40%; width: 40%;
} }
.group-total { .group-total {
width: 10%; width: 10%;
} }
.table-gray { .table-gray {
background-color: #eee; background-color: #eee;
} }
.table td, .table td,
.table th { .table th {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.bg-darker { .bg-darker {
background-color: #ddd; background-color: #ddd;
} }
td .table { td .table {
border: 0px !important; border: 0px !important;
margin-bottom: 0rem; margin-bottom: 0rem;
} }
table td:first-child { table td:first-child {
padding-left: 5px; padding-left: 5px;
} }
.table-bordered.vertical-borders td, .table-bordered.vertical-borders td,
.table-bordered.vertical-borders th { .table-bordered.vertical-borders th {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }
.table-bordered.vertical-borders thead th { .table-bordered.vertical-borders thead th {
padding: 0.25rem; padding: 0.25rem;
border-top: none; border-top: none;
border-bottom: 2px solid #dee2e6; border-bottom: 2px solid #dee2e6;
} }
.table-bordered.vertical-borders tfoot th { .table-bordered.vertical-borders tfoot th {
padding: 0.25rem; padding: 0.25rem;
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
border-bottom: none; border-bottom: none;
} }
.currency { .currency {
font-weight: normal !important; font-weight: normal !important;
} }
.underline { .underline {
text-decoration: underline; text-decoration: underline;
} }
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
@ -79,61 +92,78 @@ $BIBAccounts = new BIBAccounts();
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card card-primary "> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h3> <h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
</button>
</div>
<!-- /.card-tools -->
</div>
<div class="card-body">
<form method="post" action="" id="FilterForm"> <form method="post" action="" id="FilterForm">
<div class="row align-items-end">
<div class="col-2"> <!-- button with a dropdown -->
<div class="btn-group">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
Filters
</button>
<div class="dropdown-menu" role="menu">
<div class="form-group p-2 pb-0">
<div class="col">
<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 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="dropdown-divider"></div>
<div class="form-group"> <div class="form-check">
<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" : ""; ?>> <input class="form-check-input" type="checkbox">
<label class="form-check-label">Select
All</label>
</div>
<div class="form-check">
<input type="hidden" name="showOB" value="not">
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
<!-- <input class="form-check-input" type="checkbox"> -->
<label class="form-check-label">Opening</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox"> -->
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
<label class="form-check-label">Closing</label>
</div>
<div class="form-check">
<!-- <input class="form-check-input" type="checkbox" checked> -->
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
<label class="form-check-label">Period</label>
</div> </div>
</div> </div>
<div class="col-1 text-center"> <div class="dropdown-divider"></div>
<div class="form-group"> <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
<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" : ""; ?>>
</div>
</div>
<div class="col-1 text-center">
<div class="form-group">
<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"; ?>>
</div>
</div>
<div class="col">
<div class="form-group d-flex justify-content-end">
<button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button>
<button type="submit" class="btn btn-primary mr-2">Filter</button>
<button type="submit" class="btn btn-success mr-2">Export</button>
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
</div> </div>
</div> </div>
<div class="btn-group">
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
Export
</button>
<!-- <div class="dropdown-menu" role="menu">
<a href="#" class="dropdown-item">Export</a>
<a href="#" class="dropdown-item">Pdf</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">View calendar</a>
</div> -->
</div> </div>
<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>
</form> </form>
<script> <script>
@ -149,6 +179,7 @@ $BIBAccounts = new BIBAccounts();
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -210,23 +241,30 @@ $BIBAccounts = new BIBAccounts();
?> ?>
<?php foreach ($AccountGroups as $group) : ?> <?php foreach ($AccountGroups as $group) : ?>
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>"> <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
<td class="group-name"><b><?php // echo $group->acgroup_name; ?></b></td> <td class="group-name"><b><?php // echo $group->acgroup_name;
?></b></td>
<?php if ($ReportOptions['showOB']) : ?> <?php if ($ReportOptions['showOB']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0); ?></td> <td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0);
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0); ?></td> ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0);
?></td>
<?php endif; ?> <?php endif; ?>
<?php if ($ReportOptions['showPeriod']) : ?> <?php if ($ReportOptions['showPeriod']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0); ?></td> <td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0);
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0); ?></td> ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0);
?></td>
<?php endif; ?> <?php endif; ?>
<?php if ($ReportOptions['showClosing']) : ?> <?php if ($ReportOptions['showClosing']) : ?>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td> <td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0);
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td> ?></td>
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
?></td>
<?php endif; ?> <?php endif; ?>
</tr> </tr>
<tr> <tr>
<td colspan="7" class="group-details p-0"> <td colspan="7" class="group-details p-0">
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse "> <div id="group_<?php echo $group->acgroup_id; ?>" class=" ">
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?> <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?> <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
</div> </div>
@ -291,6 +329,7 @@ function footerfunctions()
} }
} }
}); });
function exportTableToCSV(filename) { function exportTableToCSV(filename) {
var csv = []; var csv = [];
var rows = document.querySelectorAll("table tr:not(.hide)"); var rows = document.querySelectorAll("table tr:not(.hide)");

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

@ -92,7 +92,7 @@
<!-- <h3>Currently Selected Fiscal Year ID is: <?php //echo $this->session->userdata("FiscalYearID"); <!-- <h3>Currently Selected Fiscal Year ID is: <?php //echo $this->session->userdata("FiscalYearID");
?></h3> --> ?></h3> -->
<?php $TableData = $this->db->query("select * from tbl_fiscalyear where status<>-1")->result(); ?> <?php $TableData = $this->db->query("select * from tbl_fiscalyear where status<>-1")->result(); ?>
<table class="table table-bordered table-striped dataTable"> <table class="table table-bordered table-striped longdataTable">
<thead> <thead>
<tr> <tr>
<th>Fiscal Year </th> <th>Fiscal Year </th>

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

@ -79,7 +79,7 @@
<!--COL START--> <!--COL START-->
<div class="col"> <div class="col">
<div class="form-group"> <div class="form-group">
<label for="description"><?php myLang('Description'); ?></label> <label for="description"><?php myLang('Remarks'); ?></label>
<textarea class="form-control" id="description" name="description"><?php echo isset($item) ? $item->description : ''; ?></textarea> <textarea class="form-control" id="description" name="description"><?php echo isset($item) ? $item->description : ''; ?></textarea>
</div> </div>
</div> </div>

4
account/application/views/inventory/purchases/view.php
View File

@ -38,10 +38,10 @@
<p><strong>Quantity</strong></p> <p><strong>Quantity</strong></p>
</div> </div>
<div class="col"> <div class="col">
<p><strong>Price</strong></p> <p class="text-right"><strong>Price</strong></p>
</div> </div>
<div class="col"> <div class="col">
<p><strong>Total</strong></p> <p class="text-right"><strong>Total</strong></p>
</div> </div>
</div> </div>
</div> </div>

73
account/application/views/inventory/reports/purchase_vs_sales.php
View File

@ -18,7 +18,7 @@
<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"> <div class="card-header">
Purchase Vs Sales Purchase Vs Sales
</div> </div>
@ -111,7 +111,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<!-- New Table --> <!-- New Table -->
<div class="card card-primary card-outline"> <div class="card card-primary card-outline">
<div class="card-header"> <div class="card-header">
@ -126,23 +126,26 @@
<th rowspan="2" width="30" valign="middle"><?php myLang('S.No.'); ?></th> <th rowspan="2" width="30" valign="middle"><?php myLang('S.No.'); ?></th>
<th rowspan="2"><?php myLang('Item'); ?></th> <th rowspan="2"><?php myLang('Item'); ?></th>
<th rowspan="2"><?php myLang('Units'); ?></th> <th rowspan="2"><?php myLang('Units'); ?></th>
<th colspan="2" class="text-center"><?php myLang('Opening Stock'); ?></th>
<th colspan="3" class="text-center"><?php myLang('Purchase'); ?></th> <th colspan="3" class="text-center"><?php myLang('Purchase'); ?></th>
<th colspan="3" class="text-center"><?php myLang('Sales'); ?></th> <th colspan="3" class="text-center"><?php myLang('Sales'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Sold Inventory %'); ?></th> <th rowspan="2" class="text-center"><?php myLang('Sold Inventory %'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Remaining Inventory %'); ?></th> <th rowspan="2" class="text-center"><?php myLang('Remaining Inventory %'); ?></th>
<th colspan="2" class="text-center"><?php myLang('Remaining Inventory'); ?></th> <th colspan="2" class="text-center"><?php myLang('Remaining Inventory'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Cost of Goods Sold'); ?></th> <th rowspan="2" class="text-right"><?php myLang('Cost of Goods Sold'); ?></th>
<th rowspan="2" class="text-center"><?php myLang('Gross Profit Margin'); ?></th> <th rowspan="2" class="text-center"><?php myLang('Gross Profit Margin'); ?></th>
</tr> </tr>
<tr> <tr>
<th class="text-center"><?php myLang('Qty'); ?></th> <th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Avg. Rate'); ?></th> <th class="text-right"><?php myLang('Value'); ?></th>
<th class="text-center"><?php myLang('Amount'); ?></th> <th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Qty'); ?></th> <th class="text-right"><?php myLang('Avg. Rate'); ?></th>
<th class="text-center"><?php myLang('Avg. Rate'); ?></th> <th class="text-right"><?php myLang('Amount'); ?></th>
<th class="text-center"><?php myLang('Amount'); ?></th> <th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-center"><?php myLang('Qty'); ?></th> <th class="text-right"><?php myLang('Avg. Rate'); ?></th>
<th class="text-center"><?php myLang('Value'); ?></th> <th class="text-right"><?php myLang('Amount'); ?></th>
<th class="text-right"><?php myLang('Qty'); ?></th>
<th class="text-right"><?php myLang('Value'); ?></th>
</tr> </tr>
</thead> </thead>
@ -167,11 +170,13 @@
<td class="text-center">100%</td> <td class="text-center">100%</td>
</tr> --> </tr> -->
<?php <?php
$spuramount = 0; $sumpuramount = 0;
$ssalamount = 0; $sumsaleamount = 0;
$sclqty = 0; $sumclqty = 0;
$sclamount = 0; $sumoqty = 0;
$scogs = 0; $sumoamount = 0;
$sumclamount = 0;
$sumcogs = 0;
?> ?>
<?php $a = 0; <?php $a = 0;
foreach ($StockItems as $Stock) : $a++; ?> foreach ($StockItems as $Stock) : $a++; ?>
@ -179,16 +184,18 @@
<td><?php echo $a; ?></td> <td><?php echo $a; ?></td>
<td><?php echo $Stock->Item->title; ?></td> <td><?php echo $Stock->Item->title; ?></td>
<td><?php echo $Stock->Summary->Unit->title; ?></td> <td><?php echo $Stock->Summary->Unit->title; ?></td>
<td class="text-right"><?php echo $oqty = $Stock->Summary->Opening->qty; ?></td>
<td class="text-right"><?php echo myCurrency($oamount = $Stock->Summary->Opening->amount); ?></td>
<td class="text-right"><?php echo $Stock->Summary->Purchase->qty; ?></td> <td class="text-right"><?php echo $Stock->Summary->Purchase->qty; ?></td>
<td class="text-right"><?php echo myCurrency($Stock->Summary->Purchase->rate); ?></td> <td class="text-right"><?php echo myCurrency($Stock->Summary->Purchase->rate); ?></td>
<td class="text-right"><?php echo myCurrency($puramount=$Stock->Summary->Purchase->amount); ?></td> <td class="text-right"><?php echo myCurrency($puramount=$Stock->Summary->Purchase->amount); ?></td>
<td class="text-right"><?php echo $Stock->Summary->Sales->qty; ?></td> <td class="text-right"><?php echo $Stock->Summary->Sales->qty; ?></td>
<td class="text-right"><?php echo myCurrency($Stock->Summary->Sales->rate); ?></td> <td class="text-right"><?php echo myCurrency($Stock->Summary->Sales->rate); ?></td>
<td class="text-right"><?php echo myCurrency($salamount = $Stock->Summary->Sales->amount); ?></td> <td class="text-right"><?php echo myCurrency($salamount = $Stock->Summary->Sales->amount); ?></td>
<?php $soldinventory = ((($Stock->Summary->Opening->qty)-($Stock->Summary->Closing->qty))/($Stock->Summary->Opening->qty))*100; ?> <?php $soldinventory = ((($Stock->Summary->Opening->qty)+($Stock->Summary->Purchase->qty)-($Stock->Summary->Closing->qty))/(($Stock->Summary->Opening->qty)+($Stock->Summary->Purchase->qty)))*100; ?>
<td class="text-center"><?php echo $soldinventory . "%"; ?></td> <td class="text-center"><?php echo number_format($soldinventory, 2). "%"; ?></td>
<?php $remaininventory = 100 - $soldinventory; ?> <?php $remaininventory = 100 - $soldinventory; ?>
<td class="text-center"><?php echo $remaininventory . "%"; ?></td> <td class="text-center"><?php echo number_format($remaininventory, 2) . "%"; ?></td>
<td class="text-right"><?php echo $clqty = $Stock->Summary->Closing->qty; ?></td> <td class="text-right"><?php echo $clqty = $Stock->Summary->Closing->qty; ?></td>
<td class="text-right"><?php echo myCurrency($clamount = $Stock->Summary->Closing->amount); ?></td> <td class="text-right"><?php echo myCurrency($clamount = $Stock->Summary->Closing->amount); ?></td>
<?php $cogs = ($Stock->Summary->Sales->qty) * ($Stock->Summary->Purchase->rate); ?> <?php $cogs = ($Stock->Summary->Sales->qty) * ($Stock->Summary->Purchase->rate); ?>
@ -199,11 +206,13 @@
<td></td> <td></td>
<?php <?php
$spuramount += $puramount; $sumoqty += $oqty;
$ssalamount += $salamount; $sumoamount += $oamount;
$sclqty += $clqty; $sumpuramount += $puramount;
$sclamount += $clamount; $sumsaleamount += $salamount;
$scogs += $cogs; $sumclqty += $clqty;
$sumclamount += $clamount;
$sumcogs += $cogs;
?> ?>
</tr> </tr>
@ -212,16 +221,20 @@
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="5" class="text-right text-bold">Grand Total</td> <td colspan="3" class="text-right text-bold">Grand Total</td>
<td class="text-right text-bold"><?php echo $spuramount ?></td> <td class="text-right text-bold"><?php echo $sumoqty ?></td>
<td class="text-right text-bold"><?php echo number_format($sumoamount, 2) ?></td>
<td class="text-right text-bold"></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $ssalamount ?></td> <td class="text-right text-bold"><?php echo number_format($sumpuramount, 2) ?></td>
<td class="text-right text-bold"></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $sclqty ?></td> <td class="text-right text-bold"><?php echo number_format($sumsaleamount, 2) ?></td>
<td class="text-right text-bold"><?php echo $sclamount ?></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $scogs ?></td> <td class="text-right text-bold"></td>
<td class="text-right text-bold"><?php echo $sumclqty ?></td>
<td class="text-right text-bold"><?php echo number_format($sumclamount, 2) ?></td>
<td class="text-right text-bold"><?php echo number_format($sumcogs, 2) ?></td>
<td class="text-right text-bold"></td> <td class="text-right text-bold"></td>
</tr> </tr>

2
account/application/views/inventory/stocks/summary.php
View File

@ -155,7 +155,7 @@
</div> </div>
</div> </div>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<buttom type="submit" class="btn btn-primary mr-2 text-center">Search Now</buttom> <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
</div> </div>
</div> </div>
<div class="btn-group"> <div class="btn-group">

BIN
account/pdf/ledgers/ledger_1.wpdf
View File

Binary file not shown.

BIN
account/pdf/ledgers/ledger_28.wpdf
View File

Binary file not shown.

BIN
account/pdf/vouchers/Voucher_3.pdf
View File

Binary file not shown.