diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php index 1a8ad27..7dca589 100644 --- a/account/application/libraries/Myaccounts.php +++ b/account/application/libraries/Myaccounts.php @@ -208,7 +208,7 @@ class myaccounts $html .= "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . ""; endforeach; $html .= ""; - if ($full==""){ + if ($full == "") { $html .= "Total" . myCurrency($BalanceTotal) . "" . myCurrency($BalanceTotal) . ""; } $html .= "\n"; @@ -543,7 +543,6 @@ class myaccounts - Opening Balance @@ -627,7 +626,6 @@ class myaccounts window.location = '' + id; } } - function showDetails(id) { $.ajax({ url: "" + id, @@ -664,13 +662,11 @@ class myaccounts } function showLedger($account_id, $fromDate = "", $toDate = "") { - $oldBalance = $this->getOldBalance($account_id, FYStart()); $fromDate = ($fromDate == "") ? NepaliToEnglishDate(FYStart()) : $fromDate; $toDate = ($toDate == "") ? Today() : $toDate; $ci = &get_instance(); $Transactions = $ci->db->where("transaction_date between '$fromDate' AND '$toDate'")->where("status", 1)->where("account_id", $account_id)->get("tbl_voucherdetails")->result(); - $Account = $ci->db->where("status", 1)->where("account_id", $account_id)->get("tbl_accounts")->row(); foreach ($Transactions as $T) { $T->Voucher = $ci->db->where("status", 1)->where("voucher_id", $T->voucher_id)->get("tbl_vouchers")->row(); @@ -706,12 +702,10 @@ class myaccounts $drTotal = 0; $crTotal = 0; $balance = 0; - foreach ($TableData as $TableRow) : $r++; ?> transaction_date)); ?> - voucher_id != 0) : @@ -721,9 +715,7 @@ class myaccounts echo $T->account_name; break; } - endforeach; - // pre($Tr); else : echo "Opening Balance"; @@ -733,7 +725,6 @@ class myaccounts ?> --> voucher_id); ?> - dr); $drTotal += $TableRow->dr; ?> @@ -967,13 +958,14 @@ class myaccounts - Action + Action - - "> voucher_no; ?> @@ -982,31 +974,30 @@ class myaccounts Transactions as $Transaction) : ?>
cr) ? "      " : "") . $this->getAccountDetails($Transaction->account_id)->account_name; ?>
- narration): ?> - (narration; ?>) + narration): ?> + (narration; ?>) - VoucherType->voucher_name; ?> - - Transactions as $Transaction) : $drTotal+=$Transaction->dr; ?> + Transactions as $Transaction) : $drTotal += $Transaction->dr; ?> dr); ?> - Transactions as $Transaction) : $crTotal+=$Transaction->cr; ?> + Transactions as $Transaction) : $crTotal += $Transaction->cr; ?> cr); ?> - + + @@ -1057,7 +1048,6 @@ class myaccounts } }); } - function showDetails(id) { $.ajax({ url: "" + id, @@ -1068,7 +1058,6 @@ class myaccounts } }); } - function reversalEntry() { var id = $("#reversalBtn").data("id"); if (confirm("Are you sure you want to post reversal for this voucher?")) { @@ -1094,7 +1083,6 @@ class myaccounts row.child(Transactions).show(); }); }); - function getVoucherDetails(id) { $.data; $.ajax({ @@ -1106,7 +1094,6 @@ class myaccounts }); return ($.data); } - function deleteVoucher(id) { // Show confirmation dialog if (confirm("Are you sure you want to delete this voucher?")) { @@ -1303,13 +1290,8 @@ class myaccounts - - - - - - - acgroup_name) : ?> - - - acgroup_name) : ?> + + + acgroup_name) : ?> acgroup_name; - endif; ?> + endif; ?> dbforge->add_column('tbl_vouchertypes', array('default_debits' => array('type' => 'VARCHAR', 'constraint' => 255))); } } - function hasTransaction($type, $id) { switch ($type) { diff --git a/account/application/views/accounts/ledger/navigate.php b/account/application/views/accounts/ledger/navigate.php index 763fbb1..22bcf26 100644 --- a/account/application/views/accounts/ledger/navigate.php +++ b/account/application/views/accounts/ledger/navigate.php @@ -1,5 +1,4 @@
-
@@ -15,8 +14,8 @@
-->
-
-

+
+
@@ -79,7 +78,6 @@ $tree .= "]"; var id = $(this).attr("id").substr(8); showLedger(id); }); - function getAccounts(id) { $("#accountsContainer").empty(); $.ajax({ @@ -94,7 +92,6 @@ $tree .= "]"; }); } getAccountsAll(); - function getAccountsAll() { $("#accountsContainer").html(""); $.ajax({ @@ -107,7 +104,6 @@ $tree .= "]"; } }); } - function showLedger(id) { // $("#accountsContainer").html(""); alert(id); diff --git a/account/application/views/accounts/vouchers/listvouchers.php b/account/application/views/accounts/vouchers/listvouchers.php index 7ce5746..1282cbc 100644 --- a/account/application/views/accounts/vouchers/listvouchers.php +++ b/account/application/views/accounts/vouchers/listvouchers.php @@ -1,17 +1,12 @@
-
-
-
-
-
@@ -26,11 +21,10 @@
-
-
-
+
+
@@ -42,8 +36,6 @@ $vouchertype_id = isset($_GET['vouchertypes']) ? $_GET['vouchertypes'] : ''; $this->myaccounts->listVouchers($fromDate, $toDate, $account_id, $vouchertype_id, true); ?> - -
diff --git a/account/dist/css/bbnepalcustom.css b/account/dist/css/bbnepalcustom.css index 698dfcf..9ebbb70 100644 --- a/account/dist/css/bbnepalcustom.css +++ b/account/dist/css/bbnepalcustom.css @@ -131,4 +131,7 @@ margin-bottom: .5rem; } .select2-container .select2-selection--single { height: 30px!important; +} +.mt-26{ + margin-top: 26px; } \ No newline at end of file