diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php index ad78319..1a8ad27 100644 --- a/account/application/libraries/Myaccounts.php +++ b/account/application/libraries/Myaccounts.php @@ -182,11 +182,11 @@ class myaccounts
-
+
showAccountsCategoriesCombo("accategory_id", "", "accategory_id"); ?>
- +
@@ -197,7 +197,7 @@ class myaccounts $html = ""; $html .= ""; $html .= ""; - $html .= ""; + $html .= ""; $html .= ""; $sn = 0; $BalanceTotal = 0; @@ -205,7 +205,7 @@ class myaccounts $balance = getBalance($Account->account_id); $BalanceTotal += $balance; // pre($Account); - $html .= ""; + $html .= ""; endforeach; $html .= ""; if ($full==""){ diff --git a/account/application/views/accounts/balances/bygroup.php b/account/application/views/accounts/balances/bygroup.php index 5c128c6..7f57528 100644 --- a/account/application/views/accounts/balances/bygroup.php +++ b/account/application/views/accounts/balances/bygroup.php @@ -9,9 +9,8 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories(); }
-
- -
+
+
@@ -27,6 +26,8 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
+ + @@ -45,6 +46,8 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories(); + + @@ -53,19 +56,17 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories(); + + -
AccountAccount GroupDrCrAction
AccountAccount GroupDrCrBalanceAction
" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "
Account Dr CrBalanceAction
dr); ?> cr); ?>Balance
Total
-
- -
-
\ No newline at end of file diff --git a/account/application/views/accounts/daybook.php b/account/application/views/accounts/daybook.php index 7f7778f..80321cc 100644 --- a/account/application/views/accounts/daybook.php +++ b/account/application/views/accounts/daybook.php @@ -1,24 +1,94 @@ +
-
-
- -
- +

+
+
+ +
+ + +
+
+ + +
+ +
+ +
-
-
-
- +
@@ -30,8 +100,6 @@ $vouchertype_id = isset($_GET['vouchertypes']) ? $_GET['vouchertypes'] : ''; $this->myaccounts->listVouchers($fromDate, $fromDate, $account_id, $vouchertype_id, true, true); ?> - -
diff --git a/account/application/views/accounts/ledger_bankbook.php b/account/application/views/accounts/ledger_bankbook.php index ee1a6a0..f7574cf 100644 --- a/account/application/views/accounts/ledger_bankbook.php +++ b/account/application/views/accounts/ledger_bankbook.php @@ -3,8 +3,8 @@
-
-
+
+

@@ -108,7 +108,7 @@ $html = ""; $html .= ""; $html .= ""; - $html .= ""; + $html .= ""; $html .= ""; $sn = 0; $BalanceTotal = 0; @@ -116,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 90c9f7f..08ab3ce 100644 --- a/account/application/views/accounts/ledger_cashbook.php +++ b/account/application/views/accounts/ledger_cashbook.php @@ -4,81 +4,81 @@
-
-

+
+

- - -
- -
@@ -109,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; @@ -117,30 +117,30 @@ $balance = getBalance($Account->account_id); $BalanceTotal += $balance; // pre($Account); - $html .= ""; + $html .= ""; endforeach; $html .= ""; $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) . "
\n"; $html .= "
-
-
-
-
Ledger Details
- -
-
- Ledger Details Goes Here -
- -
-
-
"; +
+
+
+
Ledger Details
+ +
+
+ Ledger Details Goes Here +
+ +
+
+
"; $html .= ''; diff --git a/account/application/views/accounts/ledger_payables.php b/account/application/views/accounts/ledger_payables.php index 8417d7e..ffa0030 100644 --- a/account/application/views/accounts/ledger_payables.php +++ b/account/application/views/accounts/ledger_payables.php @@ -6,7 +6,7 @@
-
+
diff --git a/account/application/views/accounts/ledger_receiveables.php b/account/application/views/accounts/ledger_receiveables.php index e5cbc63..10225b8 100644 --- a/account/application/views/accounts/ledger_receiveables.php +++ b/account/application/views/accounts/ledger_receiveables.php @@ -1,15 +1,12 @@
-
-
-
+
-
@@ -18,9 +15,6 @@
- - -
@@ -28,13 +22,9 @@
- - - \ No newline at end of file diff --git a/account/application/views/accounts/ledgerall.php b/account/application/views/accounts/ledgerall.php index ae63143..3203d90 100644 --- a/account/application/views/accounts/ledgerall.php +++ b/account/application/views/accounts/ledgerall.php @@ -4,7 +4,7 @@
-
+

diff --git a/account/application/views/inventory/purchases/list.php b/account/application/views/inventory/purchases/list.php index 3d21fd4..bcba2d0 100644 --- a/account/application/views/inventory/purchases/list.php +++ b/account/application/views/inventory/purchases/list.php @@ -15,9 +15,8 @@ - - - Action + + Action @@ -52,9 +51,7 @@
TotalPurchase); ?> - - - uri->segment(1) . "/" . $this->uri->segment(2) . "/details/$id"); ?> + uri->segment(1) . "/" . $this->uri->segment(2) . "/details/$id"); ?> diff --git a/account/application/views/inventory/sales/list.php b/account/application/views/inventory/sales/list.php index 0106b0c..3821230 100644 --- a/account/application/views/inventory/sales/list.php +++ b/account/application/views/inventory/sales/list.php @@ -15,8 +15,8 @@ - - + + @@ -48,7 +48,7 @@
totalsales); ?> - uri->segment(1) . "/" . $this->uri->segment(2) . "/details/$TableRow->sales_id"); ?> + uri->segment(1) . "/" . $this->uri->segment(2) . "/details/$TableRow->sales_id"); ?> sales_id); ?>