From d164f3139d8f6f72e36a08105f783be1aaa0aaf4 Mon Sep 17 00:00:00 2001 From: Sampanna Rimal Date: Mon, 5 Aug 2024 13:13:06 +0545 Subject: [PATCH] salesvspurchase and final accounts pages change --- .../controllers/accounts/Vouchers.php | 2 +- .../controllers/inventory/Items.php | 6 +- .../application/helpers/bibhelper_helper.php | 2 +- .../views/accounts/accountheads/edit.php | 4 +- .../views/accounts/accountheads/list.php | 23 +- .../views/accounts/balancesheet_new.php | 190 ++++++--- .../application/views/accounts/cash_flow.php | 128 ++++-- account/application/views/accounts/pl_new.php | 208 +++++----- .../views/accounts/receipt_and_payment.php | 144 +++++-- .../views/accounts/trialbalance_new.php | 365 ++++++++++-------- account/application/views/fiscalyear/list.php | 2 +- .../views/inventory/items/list.php | 2 +- .../views/inventory/purchases/view.php | 4 +- .../inventory/reports/purchase_vs_sales.php | 73 ++-- .../views/inventory/stocks/summary.php | 2 +- account/pdf/ledgers/ledger_1.wpdf | Bin 17877 -> 17710 bytes account/pdf/ledgers/ledger_28.wpdf | Bin 17913 -> 17715 bytes account/pdf/vouchers/Voucher_3.pdf | Bin 73670 -> 73638 bytes 18 files changed, 743 insertions(+), 412 deletions(-) diff --git a/account/application/controllers/accounts/Vouchers.php b/account/application/controllers/accounts/Vouchers.php index 5c6f181..35b4980 100644 --- a/account/application/controllers/accounts/Vouchers.php +++ b/account/application/controllers/accounts/Vouchers.php @@ -264,7 +264,7 @@ class Vouchers extends CI_Controller $entry_no++; - echo json_encode(['status' => 'success']); + // echo json_encode(['status' => 'success']); loadview("accounts/vouchers/create", $data); break; } diff --git a/account/application/controllers/inventory/Items.php b/account/application/controllers/inventory/Items.php index d27fcf2..aa84339 100644 --- a/account/application/controllers/inventory/Items.php +++ b/account/application/controllers/inventory/Items.php @@ -60,8 +60,10 @@ class Items extends CI_Controller $item_code = filter_var($_POST['item_code']); $this->db->where('status',1); $this->db->where('item_id !=', $id); - $this->db->where('title',$title); - $this->db->or_where('item_code',$item_code); + $this->db->group_start(); + $this->db->where('title', $title); + $this->db->or_where('item_code', $item_code); + $this->db->group_end(); $query = $this->db->get('tbl_items'); if($query->num_rows() > 0){ diff --git a/account/application/helpers/bibhelper_helper.php b/account/application/helpers/bibhelper_helper.php index cb86bfa..f7d9e56 100644 --- a/account/application/helpers/bibhelper_helper.php +++ b/account/application/helpers/bibhelper_helper.php @@ -153,7 +153,7 @@ function showCreateButton($url, $text = "Create") function showDetailsButton($url, $text = "Details") { ?> - " class="btn btn-primary btn-xs" title=""> - +

+ +

diff --git a/account/application/views/accounts/accountheads/list.php b/account/application/views/accounts/accountheads/list.php index 38721c7..f1ae225 100644 --- a/account/application/views/accounts/accountheads/list.php +++ b/account/application/views/accounts/accountheads/list.php @@ -40,47 +40,31 @@ @@ -91,13 +75,12 @@ - -
- +
+
@@ -204,7 +187,7 @@ echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?> - + " class="btn btn-info btn-xs" title="Edit"> diff --git a/account/application/views/accounts/balancesheet_new.php b/account/application/views/accounts/balancesheet_new.php index d373c25..a96f5c1 100644 --- a/account/application/views/accounts/balancesheet_new.php +++ b/account/application/views/accounts/balancesheet_new.php @@ -4,58 +4,71 @@ $BIBAccounts = new BIBAccounts(); ?>
- +
-
-
-
-

+
+
+
+

-
- +
+
+ + +
+ + +
+
+ + + + +
+ + + + +
+ +
+
- -
- -
-
+ + -
-
-
+
+
+
- +
- + +
- +
- + false, ); ?> - + @@ -202,15 +292,15 @@ $BIBAccounts = new BIBAccounts(); ?> - + - + @@ -355,7 +445,8 @@ $BIBAccounts = new BIBAccounts();
acgroup_name; ?>acgroup_name; ?>posting_side == "CR") ? $group->closing_balance : 0); ?>posting_side == "CR") ? $group->closing_balance : 0); ?>
getRootCategoriesWithBalances($group->acgroup_id); ?> - renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?> + renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
- getAccountGroupsWithBalances($acgroup_id = null)); ?> + getAccountGroupsWithBalances($acgroup_id = null)); + ?> @@ -377,10 +468,11 @@ function footerfunctions() document.getElementById("toggleShowAll").click(); }); - - document.getElementById("toggleShowAll").addEventListener("click", function() { + + document.getElementById("toggleShowAll").addEventListener("click", function(e) { + e.preventDefault(); var nestedRows = document.getElementsByClassName("collapse"); for (var i = 0; i < nestedRows.length; i++) { if (nestedRows[i].classList.contains("show")) { diff --git a/account/application/views/accounts/cash_flow.php b/account/application/views/accounts/cash_flow.php index f80dfaf..2e5c97d 100644 --- a/account/application/views/accounts/cash_flow.php +++ b/account/application/views/accounts/cash_flow.php @@ -101,18 +101,94 @@ $PL = $IncomesTotal - $ExpensesTotal;
-
-
-

Receipts And Payments

+
+
+

Cash Flow

- + + + +
+ + +
+
+ + + + +
+ + + + + +
-
+
-
-
+ + +
+
@@ -295,19 +373,19 @@ $PL = $IncomesTotal - $ExpensesTotal; getAccountCategoriesWithBalances(null, 3); ?> - - accounts as $account) : ?> - - - - - account_name; ?> - - balances['dr_total'] - $account->balances['cr_total']); ?> - - - + accounts as $account) : ?> + + + + + + account_name; ?> + + balances['dr_total'] - $account->balances['cr_total']); ?> + + +