From c30c5ddcb244d7e53057977c8835a80796cd2ea0 Mon Sep 17 00:00:00 2001 From: Raju Shrestha Date: Thu, 8 Aug 2024 18:24:25 +0545 Subject: [PATCH] edit css --- .../accategories/list-childs-only.php | 6 +- .../views/accounts/accountheads/list.php | 4 +- .../views/accounts/balancesheet_new.php | 86 ++----------------- .../application/views/accounts/cash_flow.php | 11 ++- .../views/accounts/ledger_bankbook.php | 79 ++++++++++++++++- .../views/accounts/ledger_cashbook.php | 81 ++++++++++++++++- account/application/views/accounts/pl_new.php | 66 ++------------ .../views/accounts/receipt_and_payment.php | 44 ++++++---- .../setup/singleentryvoucher/list.php | 16 ++-- .../views/accounts/trialbalance_new.php | 11 ++- .../views/accounts/vouchers/contra/list.php | 47 +--------- .../views/accounts/vouchers/create.php | 2 +- .../application/views/includes/sidebar.php | 8 +- .../views/inventory/items/list.php | 4 +- .../views/inventory/stocks/summary.php | 5 +- env (2) | 2 +- 16 files changed, 233 insertions(+), 239 deletions(-) diff --git a/account/application/views/accounts/accategories/list-childs-only.php b/account/application/views/accounts/accategories/list-childs-only.php index 33f6570..df6d656 100644 --- a/account/application/views/accounts/accategories/list-childs-only.php +++ b/account/application/views/accounts/accategories/list-childs-only.php @@ -34,7 +34,7 @@
myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = ""); - echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") : $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = ""); + echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") : $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under *", "parent_category_id", "status=1", $default = "", $CSSclass = ""); ?> @@ -77,8 +77,8 @@ - - Action + + Action diff --git a/account/application/views/accounts/accountheads/list.php b/account/application/views/accounts/accountheads/list.php index 3021093..19414ae 100644 --- a/account/application/views/accounts/accountheads/list.php +++ b/account/application/views/accounts/accountheads/list.php @@ -31,7 +31,7 @@
myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under", "accategory_id", "status=1", "", "select2", "required"); + $this->myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under *", "accategory_id", "status=1", "", "select2", "required"); ?>
@@ -191,7 +191,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 a96f5c1..e944f6d 100644 --- a/account/application/views/accounts/balancesheet_new.php +++ b/account/application/views/accounts/balancesheet_new.php @@ -2,7 +2,6 @@ $this->load->library("BIBAccounts"); $BIBAccounts = new BIBAccounts(); ?> - -
-
-

- +

-
- - -
- - + - -
-

Cash FlowCash Flow

@@ -155,11 +155,14 @@ $PL = $IncomesTotal - $ExpensesTotal;
- +
+ + +
- @@ -171,7 +174,7 @@ $PL = $IncomesTotal - $ExpensesTotal; View calendar
-->
- + diff --git a/account/application/views/accounts/ledger_bankbook.php b/account/application/views/accounts/ledger_bankbook.php index 2e653dd..ea98834 100644 --- a/account/application/views/accounts/ledger_bankbook.php +++ b/account/application/views/accounts/ledger_bankbook.php @@ -5,7 +5,80 @@
-

+

+
+
+ +
+ + +
+
+ + +
+ + +
+ +
@@ -35,7 +108,7 @@ $html = ""; $html .= ""; $html .= ""; - $html .= ""; + $html .= ""; $html .= ""; $sn = 0; $BalanceTotal = 0; @@ -43,7 +116,7 @@ $balance = getBalance($Account->account_id); $BalanceTotal += $balance; // pre($Account); - $html .= ""; + $html .= ""; endforeach; $html .= ""; $html .= ""; diff --git a/account/application/views/accounts/ledger_cashbook.php b/account/application/views/accounts/ledger_cashbook.php index 9941cce..0c13c56 100644 --- a/account/application/views/accounts/ledger_cashbook.php +++ b/account/application/views/accounts/ledger_cashbook.php @@ -6,6 +6,79 @@

+
+
+ +
+ + +
+
+ + +
+ + + + +
@@ -16,12 +89,12 @@ db->where("status", 1)->where("(accategory_id = 2 OR accategory_id = 3)"); $CI->db->where("status", 1)->where("accategory_id = 3"); $CI->db->order_by("account_name ASC"); $Accounts = $CI->db->get("tbl_accounts")->result(); - + foreach ($Accounts as $Account) { $Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row(); $Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row(); @@ -36,7 +109,7 @@ $html = ""; $html .= "
SnAccountAccount GroupDrCrAction
SnAccountAccount GroupDrCrAction
" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
Total" . myCurrency($BalanceTotal) . "
"; $html .= ""; - $html .= ""; + $html .= ""; $html .= ""; $sn = 0; $BalanceTotal = 0; @@ -44,7 +117,7 @@ $balance = getBalance($Account->account_id); $BalanceTotal += $balance; // pre($Account); - $html .= ""; + $html .= ""; endforeach; $html .= ""; $html .= ""; diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php index 426d1fd..9897212 100644 --- a/account/application/views/accounts/pl_new.php +++ b/account/application/views/accounts/pl_new.php @@ -4,7 +4,6 @@ $BIBAccounts = new BIBAccounts(); ?> - @@ -90,36 +89,27 @@ $BIBAccounts = new BIBAccounts(); transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } - -
- -
-

- +

-
- - -
- - + - - @@ -104,7 +107,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
-

Receipts And Payments Receipts And Payments

@@ -156,7 +159,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
- +
+ + +
@@ -172,7 +178,7 @@ $PL = $IncomesTotal - $ExpensesTotal; View calendar
-->
- + @@ -259,10 +265,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
- + - + @@ -282,15 +288,15 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - + - + @@ -313,8 +319,8 @@ $PL = $IncomesTotal - $ExpensesTotal; - - + + @@ -324,7 +330,7 @@ $PL = $IncomesTotal - $ExpensesTotal; - + @@ -340,9 +346,9 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - + @@ -352,20 +358,20 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - + - + - - + + - + diff --git a/account/application/views/accounts/setup/singleentryvoucher/list.php b/account/application/views/accounts/setup/singleentryvoucher/list.php index 4f5619c..1df38c6 100644 --- a/account/application/views/accounts/setup/singleentryvoucher/list.php +++ b/account/application/views/accounts/setup/singleentryvoucher/list.php @@ -37,12 +37,12 @@
SnAccountAccount GroupDrCrAction
SnAccountAccount GroupDrCrAction
" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
Total" . myCurrency($BalanceTotal) . "
          
     
TotalTotal TotalTotal
- - - - - - + + + + + + @@ -57,8 +57,8 @@ - - + diff --git a/account/application/views/accounts/trialbalance_new.php b/account/application/views/accounts/trialbalance_new.php index 38ac939..0e8de24 100644 --- a/account/application/views/accounts/trialbalance_new.php +++ b/account/application/views/accounts/trialbalance_new.php @@ -94,7 +94,7 @@ $BIBAccounts = new BIBAccounts();
-

+

@@ -145,11 +145,14 @@ $BIBAccounts = new BIBAccounts();
- +
+ + +
- @@ -161,7 +164,7 @@ $BIBAccounts = new BIBAccounts(); View calendar
--> - + diff --git a/account/application/views/accounts/vouchers/contra/list.php b/account/application/views/accounts/vouchers/contra/list.php index efd6525..9e1282e 100644 --- a/account/application/views/accounts/vouchers/contra/list.php +++ b/account/application/views/accounts/vouchers/contra/list.php @@ -1,121 +1,82 @@
-
-
-
-
- -

-
    - -
  1. Dashboard
    3. -
-
-
-
- -
-
- -
voucher_alias . "/create"); ?>" class="btn btn-sm btn-primary float-right"> Create New
-
-
- - -
SnVoucher NameDefault DebitsDefault CreditsVoucher ColorActionSnVoucher NameDefault DebitsDefault CreditsVoucher ColorAction
default_credits!="")?explode(",",$TableRow->default_credits):array()); ?>  +   vouchertype_id , "Edit", ""); ?>
- - - - + "> - - - - -
ID# Voucher No Voucher DateVoucher Type Voucher StateAction
voucher_id; ?> voucher_no; ?>voucher_date; ?>voucher_type; ?> voucher_state; ?> - -