From 759b97e1f082aaee4481f4bdf4575d0be27cbd83 Mon Sep 17 00:00:00 2001 From: Raju Shrestha Date: Mon, 26 Aug 2024 12:29:38 +0545 Subject: [PATCH] edit profti and loss --- account/application/libraries/BIBAccounts.php | 9 +- .../application/views/accounts/pl-bckup.php | 430 ++++++++++++++++++ account/application/views/accounts/pl_new.php | 232 +++++----- .../views/accounts/trialbalance_new.php | 29 +- .../views/inventory/itemcategories/list.php | 2 +- .../inventory/reports/purchase_vs_sales.php | 2 +- .../views/inventory/stocks/summary.php | 2 +- account/dist/css/bbnepalcustom.css | 3 + account/pdf/ledgers/ledger_33.wpdf | Bin 17717 -> 17717 bytes 9 files changed, 575 insertions(+), 134 deletions(-) create mode 100644 account/application/views/accounts/pl-bckup.php diff --git a/account/application/libraries/BIBAccounts.php b/account/application/libraries/BIBAccounts.php index c7d695a..5930957 100644 --- a/account/application/libraries/BIBAccounts.php +++ b/account/application/libraries/BIBAccounts.php @@ -766,17 +766,16 @@ class bibaccounts       account_name; ?> - posting_side == 'DR') ? $Account->opening_balance : 0); ?> - posting_side == 'CR') ? $Account->opening_balance : 0); ?> + posting_side == 'DR') ? $Account->opening_balance : 0); ?> + posting_side == 'CR') ? $Account->opening_balance : 0); ?> - posting_side == 'DR') ? $Account->regular_balance : 0); ?> posting_side == 'CR') ? $Account->regular_balance : 0); ?> - posting_side == 'DR') ? $Account->closing_balance : 0); ?> - posting_side == 'CR') ? $Account->closing_balance : 0); ?> + posting_side == 'DR') ? $Account->closing_balance : 0); ?> + posting_side == 'CR') ? $Account->closing_balance : 0); ?> diff --git a/account/application/views/accounts/pl-bckup.php b/account/application/views/accounts/pl-bckup.php new file mode 100644 index 0000000..34d78e2 --- /dev/null +++ b/account/application/views/accounts/pl-bckup.php @@ -0,0 +1,430 @@ +load->library("BIBAccounts"); +$BIBAccounts = new BIBAccounts(); +?> + + + + + + +
+
+
+
+
+

+
+
+ +
+ + +
+
+ + +
+ + +
+ +
+
+
+
+
+
+
+
+
+ +
+
+ false, + 'showOB' => false, + 'showClosing' => true, + 'showPeriod' => false, + ); + // die; + ?> + + + + + + + + + + + + + + + + $totalClosingDr) : ?> + + + + + + + + + + + + + + +
ParticularsAmountParticularsAmount
+ getAccountGroupsWithBalances(3); ?> + + + + + + + + + + + posting_side == "DR") ? $group->opening_balance : 0; + $incomes_totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0; + $incomes_totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0; + $incomes_totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0; + $incomes_totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0; + $incomes_totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; + ?> + +
acgroup_name; + ?>posting_side == "CR") ? $group->closing_balance : 0); + ?>
+
+ getRootCategoriesWithBalances($group->acgroup_id); ?> + renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?> +
+
+ 		+ getAccountGroupsWithBalances(4); ?> + + + + + + + + + + + posting_side == "DR") ? $group->opening_balance : 0; + $totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0; + $totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0; + $totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0; + $totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0; + $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; + ?> + +
acgroup_name; + ?>posting_side == "DR") ? $group->closing_balance : 0); + ?>
+
+ getRootCategoriesWithBalances($group->acgroup_id); ?> + renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?> + +
+
+
+ + + + + + +
Total Profit
+
+ + + + + +
Total Loss
+ 		+
+ + + + + +
Total Incomes + 0) : ?> + + + + +
+ 		+ + + + + +
Total Expenses + 0) : ?> + + + + +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php index 34d78e2..82f2180 100644 --- a/account/application/views/accounts/pl_new.php +++ b/account/application/views/accounts/pl_new.php @@ -88,6 +88,30 @@ $BIBAccounts = new BIBAccounts(); box-shadow: inset 0 0 0 transparent; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } + + .table1 { + border: 0px !important; + padding: 0; + margin: 10 !important; + width: 100%; + vertical-align: middle; + } + + .table-responsive { + overflow-x: auto; + } + + .card-body { + -webkit-flex: 1 1 auto; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + min-height: 1px; + padding: 0; + } + table { + border: 1px solid #ddd; + border-collapse: collapse; +}
@@ -178,33 +202,31 @@ $BIBAccounts = new BIBAccounts();
-
-
- false, - 'showOB' => false, - 'showClosing' => true, - 'showPeriod' => false, - ); - // die; - ?> - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
ParticularsAmountParticularsAmount
+
+
+
+ false, + 'showOB' => false, + 'showClosing' => true, + 'showPeriod' => false, + ); + // die; + ?> +
+
+ + + + + + + + getAccountGroupsWithBalances(3); ?> -
ParticularsAmount
- - - - - - - + - - posting_side == "DR") ? $group->opening_balance : 0; - $incomes_totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0; - $incomes_totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0; - $incomes_totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0; - $incomes_totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0; - $incomes_totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; - ?> - -
acgroup_name; - ?>posting_side == "CR") ? $group->closing_balance : 0); - ?>
-
+
+
getRootCategoriesWithBalances($group->acgroup_id); ?> renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
-
-
+
Total Loss
Total Incomes + 0) : ?> + + + + + +
+
+
+
+
+ + + + + + + + getAccountGroupsWithBalances(4); ?> -
ParticularsAmount
- - - - - - - + - - + + posting_side == "DR") ? $group->opening_balance : 0; $totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0; @@ -278,70 +311,37 @@ $BIBAccounts = new BIBAccounts(); $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0; ?> -
acgroup_name; - ?>posting_side == "DR") ? $group->closing_balance : 0); - ?>
-
+
+
getRootCategoriesWithBalances($group->acgroup_id); ?> renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
-
- - - + $totalClosingDr) : ?> - - - - - - - - -
Total Profit
- - - - - - - - - - -
Total Loss
- - - + + + Total Profit + + + - - - - - - - -
Total Incomes - 0) : ?> - - - - -
- - - - - + + + - -
Total Expenses
Total Expenses 0) : ?> - + + +
- - - + + +
+
+
+
diff --git a/account/application/views/accounts/trialbalance_new.php b/account/application/views/accounts/trialbalance_new.php index a4b2fce..8aba2ee 100644 --- a/account/application/views/accounts/trialbalance_new.php +++ b/account/application/views/accounts/trialbalance_new.php @@ -21,6 +21,7 @@ $BIBAccounts = new BIBAccounts(); .group-total { width: 10%; + } .table-gray { @@ -31,8 +32,10 @@ $BIBAccounts = new BIBAccounts(); .table th { padding: 0px; margin: 0px; + } + .table t .bg-darker { background-color: #ddd; } @@ -71,6 +74,9 @@ $BIBAccounts = new BIBAccounts(); .underline { text-decoration: underline; } + .text-right{ + padding-right: 5px; + } .form-control { display: block; @@ -88,6 +94,9 @@ $BIBAccounts = new BIBAccounts(); box-shadow: inset 0 0 0 transparent; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } + .bg-gray tr th { + vertical-align: middle; + }
@@ -202,16 +211,16 @@ $BIBAccounts = new BIBAccounts(); - + - - - - - - - - + + + + + + + + @@ -245,7 +254,7 @@ $BIBAccounts = new BIBAccounts(); - diff --git a/account/application/views/inventory/itemcategories/list.php b/account/application/views/inventory/itemcategories/list.php index 16609f0..f9c60f4 100644 --- a/account/application/views/inventory/itemcategories/list.php +++ b/account/application/views/inventory/itemcategories/list.php @@ -100,7 +100,7 @@ - + diff --git a/account/application/views/inventory/reports/purchase_vs_sales.php b/account/application/views/inventory/reports/purchase_vs_sales.php index cd51d07..51d8288 100644 --- a/account/application/views/inventory/reports/purchase_vs_sales.php +++ b/account/application/views/inventory/reports/purchase_vs_sales.php @@ -184,7 +184,7 @@ - + diff --git a/account/application/views/inventory/stocks/summary.php b/account/application/views/inventory/stocks/summary.php index 6d9437a..7243e0d 100644 --- a/account/application/views/inventory/stocks/summary.php +++ b/account/application/views/inventory/stocks/summary.php @@ -202,7 +202,7 @@ $CTotal = 0; foreach ($StockRecords as $index => $TableRow) : ?> - + diff --git a/account/dist/css/bbnepalcustom.css b/account/dist/css/bbnepalcustom.css index 079ae20..e1288c5 100644 --- a/account/dist/css/bbnepalcustom.css +++ b/account/dist/css/bbnepalcustom.css @@ -138,4 +138,7 @@ margin-bottom: .5rem; table.dataTable>thead>tr>th:not(.sorting_disabled), table.dataTable>thead>tr>td:not(.sorting_disabled) { vertical-align: middle; +} +.text-right{ + padding-right: 10px; } \ No newline at end of file diff --git a/account/pdf/ledgers/ledger_33.wpdf b/account/pdf/ledgers/ledger_33.wpdf index 8a7f1612ebe5cae7142b28bdca0f4cbd46ae4cf9..33811073c26c61ae8cb35d7d655ce7e3318ef2ea 100644 GIT binary patch delta 429 zcmV;e0aE_8iUGBX0g$JE%C(}{P+A2ij?*gtzPkp*8c_*bvbF1Xo}GDTWQMOJf!e~~ z(JK&1lpaL5l|k~rjK+aA7Nv&uGmPg1(+0kciW0_m1jHx=lpC0paf`e}Z@_wu)?C}p3@G%shz z!-B_7qfjTzA^s}HS#&PNJT1KLQ_dn^F7tB!kl|B)w76L@FV7?uz6g1L14)GnoJmQOY~PRBQ}-zE!QPM@=`Yb*$Gg#RjJ{Uwot) zI2n7J$R=Z delta 429 zcmV;e0aE_8iUGBX0g$JE>b0WSP+A2ij?*gtzPkp>8c_*bvbF1Xo}GDTWQNZpf!e~K z(F+hslpaL5l|k~rjK+aA7Nv&u6O88s(+0kbiW0_m1jHx=lpC0paf`e}Z@_wu)O#Dqo$kHI@W8LVuRC}FW%D( zoQ%CqWRoBD`q!mQd4-BoS^oUoHophDV0q{TA8hAfd-yGA&#^NN{rRhH4Rm(>FY$*A X(6eL$N
ParticularsParticulars OpeningCurrent PeriodClosingOpeningCurrent PeriodClosing
posting_side == "DR") ? $group->opening_balance : 0); ?>posting_side == "CR") ? $group->opening_balance : 0); + posting_side == "CR") ? $group->opening_balance : 0); ?>
title; ?> description; ?>
Item->title; ?> Summary->Unit->title; ?> Summary->Opening->qty; ?>
Item) ? $TableRow->Item->title : "N/A"; ?> Item->units_id); ?> Summary->Opening->qty; ?>